annotate mpegvideo.c @ 2514:fc23a5a86d97 libavcodec

removing --disable-risky patch by (Josh Varner <jlvarner gmail com>)
author michael
date Mon, 21 Feb 2005 17:50:48 +0000
parents 258120c61eea
children e25782262d7d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * The simplest mpeg encoder (well, it was the simplest!)
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
3 * Copyright (c) 2000,2001 Fabrice Bellard.
1739
07a484280a82 copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents: 1729
diff changeset
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
6 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
8 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
9 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
10 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
11 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
14 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
15 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
19 *
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
20 * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
21 */
701
85b071dfc7e3 ff_get_fourcc() & XVIX support
michaelni
parents: 697
diff changeset
22
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
23 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
24 * @file mpegvideo.c
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
25 * The simplest mpeg encoder (well, it was the simplest!).
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
26 */
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
27
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
28 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
30 #include "mpegvideo.h"
1557
5d53c03186a1 floating point AAN DCT
michael
parents: 1556
diff changeset
31 #include "faandct.h"
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
32 #include <limits.h>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
33
17
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 13
diff changeset
34 #ifdef USE_FASTMEMCPY
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 13
diff changeset
35 #include "fastmemcpy.h"
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 13
diff changeset
36 #endif
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 13
diff changeset
37
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
38 //#undef NDEBUG
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
39 //#include <assert.h>
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
40
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
41 #ifdef CONFIG_ENCODERS
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
42 static void encode_picture(MpegEncContext *s, int picture_number);
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
43 #endif //CONFIG_ENCODERS
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
44 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
45 DCTELEM *block, int n, int qscale);
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
46 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
47 DCTELEM *block, int n, int qscale);
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
48 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
49 DCTELEM *block, int n, int qscale);
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
50 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
51 DCTELEM *block, int n, int qscale);
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
52 static void dct_unquantize_h263_intra_c(MpegEncContext *s,
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
53 DCTELEM *block, int n, int qscale);
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
54 static void dct_unquantize_h263_inter_c(MpegEncContext *s,
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
55 DCTELEM *block, int n, int qscale);
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
56 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w);
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
57 #ifdef CONFIG_ENCODERS
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
58 static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
59 static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
60 static int dct_quantize_refine(MpegEncContext *s, DCTELEM *block, int16_t *weight, DCTELEM *orig, int n, int qscale);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
61 static int sse_mb(MpegEncContext *s);
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
62 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block);
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
63 #endif //CONFIG_ENCODERS
206
994aa8623443 (commit by michael)
arpi_esp
parents: 200
diff changeset
64
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
65 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
66 extern int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
67 extern void XVMC_field_end(MpegEncContext *s);
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
68 extern void XVMC_decode_mb(MpegEncContext *s);
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
69 #endif
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
70
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
71 void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, int w)= draw_edges_c;
206
994aa8623443 (commit by michael)
arpi_esp
parents: 200
diff changeset
72
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
73
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 /* enable all paranoid tests for rounding, overflows, etc... */
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 //#define PARANOID
986e461dc072 Initial revision
glantau
parents:
diff changeset
76
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 //#define DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
78
321
2b00e171b1d4 - ME method compatibility with legacy apps.
pulento
parents: 320
diff changeset
79
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 /* for jpeg fast DCT */
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 #define CONST_BITS 14
986e461dc072 Initial revision
glantau
parents:
diff changeset
82
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
83 static const uint16_t aanscales[64] = {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 /* precomputed values scaled up by 14 bits */
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520,
986e461dc072 Initial revision
glantau
parents:
diff changeset
86 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270,
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906,
986e461dc072 Initial revision
glantau
parents:
diff changeset
88 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315,
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520,
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552,
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
91 8867 , 12299, 11585, 10426, 8867, 6967, 4799, 2446,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
92 4520 , 6270, 5906, 5315, 4520, 3552, 2446, 1247
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
94
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
95 static const uint8_t h263_chroma_roundtab[16] = {
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
96 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
99
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
100 static const uint8_t ff_default_chroma_qscale_table[32]={
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
101 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
102 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
103 };
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
104
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
105 #ifdef CONFIG_ENCODERS
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1160
diff changeset
106 static uint8_t (*default_mv_penalty)[MAX_MV*2+1]=NULL;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
107 static uint8_t default_fcode_tab[MAX_MV*2+1];
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
108
998
6129c88a6393 get_format()
michaelni
parents: 956
diff changeset
109 enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1};
6129c88a6393 get_format()
michaelni
parents: 956
diff changeset
110
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
111 static void convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64],
2385
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
112 const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 {
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
114 int qscale;
2385
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
115 int shift=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
116
709
afeff6ccb7f5 convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents: 706
diff changeset
117 for(qscale=qmin; qscale<=qmax; qscale++){
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
118 int i;
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
119 if (dsp->fdct == ff_jpeg_fdct_islow
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
120 #ifdef FAAN_POSTSCALE
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
121 || dsp->fdct == ff_faandct
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
122 #endif
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
123 ) {
625
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
124 for(i=0;i<64;i++) {
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
125 const int j= dsp->idct_permutation[i];
625
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
126 /* 16 <= qscale * quant_matrix[i] <= 7905 */
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
127 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
128 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
129 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
130
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
131 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) /
625
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
132 (qscale * quant_matrix[j]));
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
133 }
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
134 } else if (dsp->fdct == fdct_ifast
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
135 #ifndef FAAN_POSTSCALE
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
136 || dsp->fdct == ff_faandct
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
137 #endif
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
138 ) {
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
139 for(i=0;i<64;i++) {
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
140 const int j= dsp->idct_permutation[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
141 /* 16 <= qscale * quant_matrix[i] <= 7905 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
142 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
143 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
144 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
145
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
146 qmat[qscale][i] = (int)((uint64_t_C(1) << (QMAT_SHIFT + 14)) /
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
147 (aanscales[i] * qscale * quant_matrix[j]));
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
148 }
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
149 } else {
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
150 for(i=0;i<64;i++) {
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
151 const int j= dsp->idct_permutation[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
152 /* We can safely suppose that 16 <= quant_matrix[i] <= 255
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
153 So 16 <= qscale * quant_matrix[i] <= 7905
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
154 so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
155 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
156 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
157 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j]));
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
158 // qmat [qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]);
1554
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
159 qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]);
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
160
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
161 if(qmat16[qscale][0][i]==0 || qmat16[qscale][0][i]==128*256) qmat16[qscale][0][i]=128*256-1;
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
162 qmat16[qscale][1][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][0][i]);
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
163 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 }
2385
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
165
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
166 for(i=intra; i<64; i++){
2390
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
167 int64_t max= 8191;
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
168 if (dsp->fdct == fdct_ifast
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
169 #ifndef FAAN_POSTSCALE
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
170 || dsp->fdct == ff_faandct
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
171 #endif
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
172 ) {
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
173 max= (8191LL*aanscales[i]) >> 14;
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
174 }
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
175 while(((max * qmat[qscale][i]) >> shift) > INT_MAX){
2385
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
176 shift++;
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
177 }
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
178 }
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
179 }
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
180 if(shift){
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
181 av_log(NULL, AV_LOG_INFO, "Warning, QMAT_SHIFT is larger then %d, overflows possible\n", QMAT_SHIFT - shift);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
183 }
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
184
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
185 static inline void update_qscale(MpegEncContext *s){
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
186 s->qscale= (s->lambda*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7);
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
187 s->qscale= clip(s->qscale, s->avctx->qmin, s->avctx->qmax);
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
188
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
189 s->lambda2= (s->lambda*s->lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT;
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
190 }
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
191 #endif //CONFIG_ENCODERS
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
192
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
193 void ff_init_scantable(uint8_t *permutation, ScanTable *st, const uint8_t *src_scantable){
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
194 int i;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
195 int end;
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
196
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
197 st->scantable= src_scantable;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
198
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
199 for(i=0; i<64; i++){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
200 int j;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
201 j = src_scantable[i];
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
202 st->permutated[i] = permutation[j];
828
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
203 #ifdef ARCH_POWERPC
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
204 st->inverse[j] = i;
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
205 #endif
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
206 }
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
207
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
208 end=-1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
209 for(i=0; i<64; i++){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
210 int j;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
211 j = st->permutated[i];
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
212 if(j>end) end=j;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
213 st->raster_end[i]= end;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
214 }
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
215 }
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
216
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1523
diff changeset
217 #ifdef CONFIG_ENCODERS
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
218 void ff_write_quant_matrix(PutBitContext *pb, int16_t *matrix){
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
219 int i;
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
220
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
221 if(matrix){
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
222 put_bits(pb, 1, 1);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
223 for(i=0;i<64;i++) {
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
224 put_bits(pb, 8, matrix[ ff_zigzag_direct[i] ]);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
225 }
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
226 }else
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
227 put_bits(pb, 1, 0);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
228 }
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1523
diff changeset
229 #endif //CONFIG_ENCODERS
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
230
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
231 /* init common dct for both encoder and decoder */
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
232 int DCT_common_init(MpegEncContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
234 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
235 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
236 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
237 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
238 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
239 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
240
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
241 #ifdef CONFIG_ENCODERS
625
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
242 s->dct_quantize= dct_quantize_c;
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
243 s->denoise_dct= denoise_dct_c;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
244 #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
245
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
246 #ifdef HAVE_MMX
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
247 MPV_common_init_mmx(s);
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 7
diff changeset
248 #endif
514
c9f724e3a797 Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents: 506
diff changeset
249 #ifdef ARCH_ALPHA
c9f724e3a797 Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents: 506
diff changeset
250 MPV_common_init_axp(s);
c9f724e3a797 Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents: 506
diff changeset
251 #endif
628
f596db4aa871 sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents: 625
diff changeset
252 #ifdef HAVE_MLIB
f596db4aa871 sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents: 625
diff changeset
253 MPV_common_init_mlib(s);
f596db4aa871 sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents: 625
diff changeset
254 #endif
721
71f669e9f633 ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents: 717
diff changeset
255 #ifdef HAVE_MMI
71f669e9f633 ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents: 717
diff changeset
256 MPV_common_init_mmi(s);
71f669e9f633 ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents: 717
diff changeset
257 #endif
730
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
258 #ifdef ARCH_ARMV4L
874
8cc0d241da37 * compilation fix (ARM users please check)
kabi
parents: 862
diff changeset
259 MPV_common_init_armv4l(s);
730
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
260 #endif
828
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
261 #ifdef ARCH_POWERPC
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
262 MPV_common_init_ppc(s);
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
263 #endif
730
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
264
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
265 #ifdef CONFIG_ENCODERS
1007
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 1002
diff changeset
266 s->fast_dct_quantize= s->dct_quantize;
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 1002
diff changeset
267
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
268 if(s->flags&CODEC_FLAG_TRELLIS_QUANT){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
269 s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_*
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
270 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
271
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
272 #endif //CONFIG_ENCODERS
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
273
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
274 /* load & permutate scantables
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
275 note: only wmv uses differnt ones
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
276 */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
277 if(s->alternate_scan){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
278 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
279 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
280 }else{
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
281 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
282 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
283 }
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
284 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
285 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
591
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 588
diff changeset
286
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
287 return 0;
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
288 }
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
289
1539
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
290 static void copy_picture(Picture *dst, Picture *src){
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
291 *dst = *src;
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
292 dst->type= FF_BUFFER_TYPE_COPY;
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
293 }
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
294
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
295 static void copy_picture_attributes(MpegEncContext *s, AVFrame *dst, AVFrame *src){
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
296 int i;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
297
1702
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
298 dst->pict_type = src->pict_type;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
299 dst->quality = src->quality;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
300 dst->coded_picture_number = src->coded_picture_number;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
301 dst->display_picture_number = src->display_picture_number;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
302 // dst->reference = src->reference;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
303 dst->pts = src->pts;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
304 dst->interlaced_frame = src->interlaced_frame;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
305 dst->top_field_first = src->top_field_first;
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
306
1945
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
307 if(s->avctx->me_threshold){
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
308 if(!src->motion_val[0])
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
309 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_val not set!\n");
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
310 if(!src->mb_type)
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
311 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.mb_type not set!\n");
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
312 if(!src->ref_index[0])
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
313 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.ref_index not set!\n");
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
314 if(src->motion_subsample_log2 != dst->motion_subsample_log2)
1955
5dafb10e0252 reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents: 1948
diff changeset
315 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_subsample_log2 doesnt match! (%d!=%d)\n",
5dafb10e0252 reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents: 1948
diff changeset
316 src->motion_subsample_log2, dst->motion_subsample_log2);
1945
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
317
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
318 memcpy(dst->mb_type, src->mb_type, s->mb_stride * s->mb_height * sizeof(dst->mb_type[0]));
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
319
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
320 for(i=0; i<2; i++){
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
321 int stride= ((16*s->mb_width )>>src->motion_subsample_log2) + 1;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
322 int height= ((16*s->mb_height)>>src->motion_subsample_log2);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
323
1945
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
324 if(src->motion_val[i] && src->motion_val[i] != dst->motion_val[i]){
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
325 memcpy(dst->motion_val[i], src->motion_val[i], 2*stride*height*sizeof(int16_t));
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
326 }
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
327 if(src->ref_index[i] && src->ref_index[i] != dst->ref_index[i]){
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1947
diff changeset
328 memcpy(dst->ref_index[i], src->ref_index[i], s->b8_stride*2*s->mb_height*sizeof(int8_t));
1945
32f68745c431 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents: 1944
diff changeset
329 }
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
330 }
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
331 }
1702
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
332 }
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
333
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
334 /**
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
335 * allocates a Picture
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
336 * The pixels are allocated/set by calling get_buffer() if shared=0
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
337 */
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
338 static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
339 const int big_mb_num= s->mb_stride*(s->mb_height+1) + 1; //the +1 is needed so memset(,,stride*height) doesnt sig11
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
340 const int mb_array_size= s->mb_stride*s->mb_height;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
341 const int b8_array_size= s->b8_stride*s->mb_height*2;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
342 const int b4_array_size= s->b4_stride*s->mb_height*4;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
343 int i;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
344
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
345 if(shared){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
346 assert(pic->data[0]);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
347 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
348 pic->type= FF_BUFFER_TYPE_SHARED;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
349 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
350 int r;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
351
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
352 assert(!pic->data[0]);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
353
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
354 r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
355
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
356 if(r<0 || !pic->age || !pic->type || !pic->data[0]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
357 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n", r, pic->age, pic->type, pic->data[0]);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
358 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
359 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
360
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
361 if(s->linesize && (s->linesize != pic->linesize[0] || s->uvlinesize != pic->linesize[1])){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
362 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (stride changed)\n");
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
363 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
364 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
365
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
366 if(pic->linesize[1] != pic->linesize[2]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
367 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (uv stride missmatch)\n");
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
368 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
369 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
370
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
371 s->linesize = pic->linesize[0];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
372 s->uvlinesize= pic->linesize[1];
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
373 }
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
374
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
375 if(pic->qscale_table==NULL){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
376 if (s->encoding) {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
377 CHECKED_ALLOCZ(pic->mb_var , mb_array_size * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
378 CHECKED_ALLOCZ(pic->mc_mb_var, mb_array_size * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
379 CHECKED_ALLOCZ(pic->mb_mean , mb_array_size * sizeof(int8_t))
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
380 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
381
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
382 CHECKED_ALLOCZ(pic->mbskip_table , mb_array_size * sizeof(uint8_t)+2) //the +2 is for the slice end check
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
383 CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t))
1742
e39651dd13a9 type fixes, found by Wolfgang Hesseler
michael
parents: 1739
diff changeset
384 CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(uint32_t))
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
385 pic->mb_type= pic->mb_type_base + s->mb_stride+1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
386 if(s->out_format == FMT_H264){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
387 for(i=0; i<2; i++){
1885
6588eda7d107 alignment fix
michael
parents: 1884
diff changeset
388 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+2) * sizeof(int16_t))
6588eda7d107 alignment fix
michael
parents: 1884
diff changeset
389 pic->motion_val[i]= pic->motion_val_base[i]+2;
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1947
diff changeset
390 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t))
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
391 }
1669
072666f04bca motion_subsample_log2
michael
parents: 1668
diff changeset
392 pic->motion_subsample_log2= 2;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
393 }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
394 for(i=0; i<2; i++){
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
395 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+2) * sizeof(int16_t))
1885
6588eda7d107 alignment fix
michael
parents: 1884
diff changeset
396 pic->motion_val[i]= pic->motion_val_base[i]+2;
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1947
diff changeset
397 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
398 }
1669
072666f04bca motion_subsample_log2
michael
parents: 1668
diff changeset
399 pic->motion_subsample_log2= 3;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
400 }
1833
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
401 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) {
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
402 CHECKED_ALLOCZ(pic->dct_coeff, 64 * mb_array_size * sizeof(DCTELEM)*6)
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
403 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
404 pic->qstride= s->mb_stride;
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1542
diff changeset
405 CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan))
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
406 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
407
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
408 //it might be nicer if the application would keep track of these but it would require a API change
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
409 memmove(s->prev_pict_types+1, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE-1);
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
410 s->prev_pict_types[0]= s->pict_type;
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
411 if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == B_TYPE)
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
412 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
413
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
414 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
415 fail: //for the CHECKED_ALLOCZ macro
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
416 return -1;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
417 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
418
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
419 /**
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
420 * deallocates a picture
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
421 */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
422 static void free_picture(MpegEncContext *s, Picture *pic){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
423 int i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
424
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
425 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
426 s->avctx->release_buffer(s->avctx, (AVFrame*)pic);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
427 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
428
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
429 av_freep(&pic->mb_var);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
430 av_freep(&pic->mc_mb_var);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
431 av_freep(&pic->mb_mean);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
432 av_freep(&pic->mbskip_table);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
433 av_freep(&pic->qscale_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
434 av_freep(&pic->mb_type_base);
1833
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
435 av_freep(&pic->dct_coeff);
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1542
diff changeset
436 av_freep(&pic->pan_scan);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
437 pic->mb_type= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
438 for(i=0; i<2; i++){
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
439 av_freep(&pic->motion_val_base[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
440 av_freep(&pic->ref_index[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
441 }
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
442
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
443 if(pic->type == FF_BUFFER_TYPE_SHARED){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
444 for(i=0; i<4; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
445 pic->base[i]=
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
446 pic->data[i]= NULL;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
447 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
448 pic->type= 0;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
449 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
450 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
451
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
452 static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
453 int i;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
454
1838
8cdbb74c2f4b 10l (vdpart fix)
michael
parents: 1834
diff changeset
455 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
456 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
457 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
458
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
459 //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer()
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
460 CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t))
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
461 s->rd_scratchpad= s->me.scratchpad;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
462 s->b_scratchpad= s->me.scratchpad;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
463 s->obmc_scratchpad= s->me.scratchpad + 16;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
464 if (s->encoding) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
465 CHECKED_ALLOCZ(s->me.map , ME_MAP_SIZE*sizeof(uint32_t))
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
466 CHECKED_ALLOCZ(s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t))
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
467 if(s->avctx->noise_reduction){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
468 CHECKED_ALLOCZ(s->dct_error_sum, 2 * 64 * sizeof(int))
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
469 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
470 }
1848
c72589baee53 initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents: 1846
diff changeset
471 CHECKED_ALLOCZ(s->blocks, 64*12*2 * sizeof(DCTELEM))
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
472 s->block= s->blocks[0];
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
473
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
474 for(i=0;i<12;i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
475 s->pblocks[i] = (short *)(&s->block[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
476 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
477 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
478 fail:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
479 return -1; //free() through MPV_common_end()
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
480 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
481
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
482 static void free_duplicate_context(MpegEncContext *s){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
483 if(s==NULL) return;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
484
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
485 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
486 av_freep(&s->me.scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
487 s->rd_scratchpad=
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
488 s->b_scratchpad=
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
489 s->obmc_scratchpad= NULL;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
490
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
491 av_freep(&s->dct_error_sum);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
492 av_freep(&s->me.map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
493 av_freep(&s->me.score_map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
494 av_freep(&s->blocks);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
495 s->block= NULL;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
496 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
497
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
498 static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
499 #define COPY(a) bak->a= src->a
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
500 COPY(allocated_edge_emu_buffer);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
501 COPY(edge_emu_buffer);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
502 COPY(me.scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
503 COPY(rd_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
504 COPY(b_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
505 COPY(obmc_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
506 COPY(me.map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
507 COPY(me.score_map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
508 COPY(blocks);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
509 COPY(block);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
510 COPY(start_mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
511 COPY(end_mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
512 COPY(me.map_generation);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
513 COPY(pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
514 COPY(dct_error_sum);
1810
fc6b38b5dd40 noise reduction with threads bugfix
michael
parents: 1805
diff changeset
515 COPY(dct_count[0]);
fc6b38b5dd40 noise reduction with threads bugfix
michael
parents: 1805
diff changeset
516 COPY(dct_count[1]);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
517 #undef COPY
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
518 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
519
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
520 void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
521 MpegEncContext bak;
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
522 int i;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
523 //FIXME copy only needed parts
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
524 //START_TIMER
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
525 backup_duplicate_context(&bak, dst);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
526 memcpy(dst, src, sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
527 backup_duplicate_context(dst, &bak);
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
528 for(i=0;i<12;i++){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
529 dst->pblocks[i] = (short *)(&dst->block[i]);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
530 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
531 //STOP_TIMER("update_duplicate_context") //about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
532 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
533
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
534 static void update_duplicate_context_after_me(MpegEncContext *dst, MpegEncContext *src){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
535 #define COPY(a) dst->a= src->a
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
536 COPY(pict_type);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
537 COPY(current_picture);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
538 COPY(f_code);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
539 COPY(b_code);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
540 COPY(qscale);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
541 COPY(lambda);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
542 COPY(lambda2);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
543 COPY(picture_in_gop_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
544 COPY(gop_picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
545 COPY(frame_pred_frame_dct); //FIXME dont set in encode_header
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
546 COPY(progressive_frame); //FIXME dont set in encode_header
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
547 COPY(partitioned_frame); //FIXME dont set in encode_header
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
548 #undef COPY
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
549 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
550
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
551 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
552 * sets the given MpegEncContext to common defaults (same for encoding and decoding).
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
553 * the changed fields will not depend upon the prior state of the MpegEncContext.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
554 */
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
555 static void MPV_common_defaults(MpegEncContext *s){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
556 s->y_dc_scale_table=
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
557 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
558 s->chroma_qscale_table= ff_default_chroma_qscale_table;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
559 s->progressive_frame= 1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
560 s->progressive_sequence= 1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
561 s->picture_structure= PICT_FRAME;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
562
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
563 s->coded_picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
564 s->picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
565 s->input_picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
566
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
567 s->picture_in_gop_number = 0;
1894
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
568
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
569 s->f_code = 1;
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
570 s->b_code = 1;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
571 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
572
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
573 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
574 * sets the given MpegEncContext to defaults for decoding.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
575 * the changed fields will not depend upon the prior state of the MpegEncContext.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
576 */
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
577 void MPV_decode_defaults(MpegEncContext *s){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
578 MPV_common_defaults(s);
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
579 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
580
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
581 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
582 * sets the given MpegEncContext to defaults for encoding.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
583 * the changed fields will not depend upon the prior state of the MpegEncContext.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
584 */
1902
a5588762c4fa Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents: 1894
diff changeset
585
a5588762c4fa Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents: 1894
diff changeset
586 #ifdef CONFIG_ENCODERS
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
587 static void MPV_encode_defaults(MpegEncContext *s){
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
588 static int done=0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
589
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
590 MPV_common_defaults(s);
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
591
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
592 if(!done){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
593 int i;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
594 done=1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
595
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
596 default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) );
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
597 memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1));
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
598
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
599 for(i=-16; i<16; i++){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
600 default_fcode_tab[i + MAX_MV]= 1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
601 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
602 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
603 s->me.mv_penalty= default_mv_penalty;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
604 s->fcode_tab= default_fcode_tab;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
605 }
1902
a5588762c4fa Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents: 1894
diff changeset
606 #endif //CONFIG_ENCODERS
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
607
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
608 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
609 * init common structure for both encoder and decoder.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
610 * this assumes that some variables like width/height are already set
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
611 */
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
612 int MPV_common_init(MpegEncContext *s)
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
613 {
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
614 int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y;
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
615
1991
michael
parents: 1989
diff changeset
616 if(s->avctx->thread_count > MAX_THREADS || (16*s->avctx->thread_count > s->height && s->height)){
1989
michael
parents: 1988
diff changeset
617 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
michael
parents: 1988
diff changeset
618 return -1;
michael
parents: 1988
diff changeset
619 }
michael
parents: 1988
diff changeset
620
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
621 if((s->width || s->height) && avcodec_check_dimensions(s->avctx, s->width, s->height))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
622 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
623
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
624 dsputil_init(&s->dsp, s->avctx);
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
625 DCT_common_init(s);
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
626
754
b2767c9d6455 init flags before using it (found by arpi)
michaelni
parents: 753
diff changeset
627 s->flags= s->avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
628 s->flags2= s->avctx->flags2;
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
629
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
630 s->mb_width = (s->width + 15) / 16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
631 s->mb_height = (s->height + 15) / 16;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
632 s->mb_stride = s->mb_width + 1;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
633 s->b8_stride = s->mb_width*2 + 1;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
634 s->b4_stride = s->mb_width*4 + 1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
635 mb_array_size= s->mb_height * s->mb_stride;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
636 mv_table_size= (s->mb_height+2) * s->mb_stride + 1;
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
637
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
638 /* set chroma shifts */
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
639 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt,&(s->chroma_x_shift),
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
640 &(s->chroma_y_shift) );
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
641
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
642 /* set default edge pos, will be overriden in decode_header if needed */
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
643 s->h_edge_pos= s->mb_width*16;
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
644 s->v_edge_pos= s->mb_height*16;
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
645
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
646 s->mb_num = s->mb_width * s->mb_height;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
647
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
648 s->block_wrap[0]=
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
649 s->block_wrap[1]=
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
650 s->block_wrap[2]=
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
651 s->block_wrap[3]= s->b8_stride;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
652 s->block_wrap[4]=
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
653 s->block_wrap[5]= s->mb_stride;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
654
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
655 y_size = s->b8_stride * (2 * s->mb_height + 1);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
656 c_size = s->mb_stride * (s->mb_height + 1);
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
657 yc_size = y_size + 2 * c_size;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
658
701
85b071dfc7e3 ff_get_fourcc() & XVIX support
michaelni
parents: 697
diff changeset
659 /* convert fourcc to upper case */
1116
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
660 s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF)
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
661 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 )
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
662 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16)
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
663 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24);
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
664
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
665 s->avctx->stream_codec_tag= toupper( s->avctx->stream_codec_tag &0xFF)
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
666 + (toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 )
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
667 + (toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16)
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
668 + (toupper((s->avctx->stream_codec_tag>>24)&0xFF)<<24);
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
669
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
670 s->avctx->coded_frame= (AVFrame*)&s->current_picture;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
671
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
672 CHECKED_ALLOCZ(s->mb_index2xy, (s->mb_num+1)*sizeof(int)) //error ressilience code looks cleaner with this
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
673 for(y=0; y<s->mb_height; y++){
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
674 for(x=0; x<s->mb_width; x++){
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
675 s->mb_index2xy[ x + y*s->mb_width ] = x + y*s->mb_stride;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
676 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
677 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
678 s->mb_index2xy[ s->mb_height*s->mb_width ] = (s->mb_height-1)*s->mb_stride + s->mb_width; //FIXME really needed?
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
679
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
680 if (s->encoding) {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
681 /* Allocate MV tables */
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
682 CHECKED_ALLOCZ(s->p_mv_table_base , mv_table_size * 2 * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
683 CHECKED_ALLOCZ(s->b_forw_mv_table_base , mv_table_size * 2 * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
684 CHECKED_ALLOCZ(s->b_back_mv_table_base , mv_table_size * 2 * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
685 CHECKED_ALLOCZ(s->b_bidir_forw_mv_table_base , mv_table_size * 2 * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
686 CHECKED_ALLOCZ(s->b_bidir_back_mv_table_base , mv_table_size * 2 * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
687 CHECKED_ALLOCZ(s->b_direct_mv_table_base , mv_table_size * 2 * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
688 s->p_mv_table = s->p_mv_table_base + s->mb_stride + 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
689 s->b_forw_mv_table = s->b_forw_mv_table_base + s->mb_stride + 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
690 s->b_back_mv_table = s->b_back_mv_table_base + s->mb_stride + 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
691 s->b_bidir_forw_mv_table= s->b_bidir_forw_mv_table_base + s->mb_stride + 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
692 s->b_bidir_back_mv_table= s->b_bidir_back_mv_table_base + s->mb_stride + 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
693 s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
694
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
695 if(s->msmpeg4_version){
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
696 CHECKED_ALLOCZ(s->ac_stats, 2*2*(MAX_LEVEL+1)*(MAX_RUN+1)*2*sizeof(int));
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
697 }
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
698 CHECKED_ALLOCZ(s->avctx->stats_out, 256);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
699
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
700 /* Allocate MB type table */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
701 CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint16_t)) //needed for encoding
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
702
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
703 CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int))
1553
541681146f83 move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents: 1552
diff changeset
704
541681146f83 move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents: 1552
diff changeset
705 CHECKED_ALLOCZ(s->q_intra_matrix, 64*32 * sizeof(int))
541681146f83 move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents: 1552
diff changeset
706 CHECKED_ALLOCZ(s->q_inter_matrix, 64*32 * sizeof(int))
1554
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
707 CHECKED_ALLOCZ(s->q_intra_matrix16, 64*32*2 * sizeof(uint16_t))
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
708 CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t))
1556
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
709 CHECKED_ALLOCZ(s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*))
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
710 CHECKED_ALLOCZ(s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*))
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
711
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
712 if(s->avctx->noise_reduction){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
713 CHECKED_ALLOCZ(s->dct_offset, 2 * 64 * sizeof(uint16_t))
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
714 }
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
715 }
1552
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
716 CHECKED_ALLOCZ(s->picture, MAX_PICTURE_COUNT * sizeof(Picture))
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
717
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
718 CHECKED_ALLOCZ(s->error_status_table, mb_array_size*sizeof(uint8_t))
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
719
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
720 if(s->codec_id==CODEC_ID_MPEG4 || (s->flags & CODEC_FLAG_INTERLACED_ME)){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
721 /* interlaced direct mode decoding tables */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
722 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
723 int j, k;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
724 for(j=0; j<2; j++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
725 for(k=0; k<2; k++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
726 CHECKED_ALLOCZ(s->b_field_mv_table_base[i][j][k] , mv_table_size * 2 * sizeof(int16_t))
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
727 s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
728 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
729 CHECKED_ALLOCZ(s->b_field_select_table[i][j] , mb_array_size * 2 * sizeof(uint8_t))
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
730 CHECKED_ALLOCZ(s->p_field_mv_table_base[i][j] , mv_table_size * 2 * sizeof(int16_t))
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
731 s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
732 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
733 CHECKED_ALLOCZ(s->p_field_select_table[i] , mb_array_size * 2 * sizeof(uint8_t))
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
734 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
735 }
767
c75c3f1bef4b regression test for H263+
michaelni
parents: 766
diff changeset
736 if (s->out_format == FMT_H263) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
737 /* ac values */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
738 CHECKED_ALLOCZ(s->ac_val_base, yc_size * sizeof(int16_t) * 16);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
739 s->ac_val[0] = s->ac_val_base + s->b8_stride + 1;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
740 s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
741 s->ac_val[2] = s->ac_val[1] + c_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
742
986e461dc072 Initial revision
glantau
parents:
diff changeset
743 /* cbp values */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
744 CHECKED_ALLOCZ(s->coded_block_base, y_size);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
745 s->coded_block= s->coded_block_base + s->b8_stride + 1;
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 329
diff changeset
746
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
747 /* cbp, ac_pred, pred_dir */
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
748 CHECKED_ALLOCZ(s->cbp_table , mb_array_size * sizeof(uint8_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
749 CHECKED_ALLOCZ(s->pred_dir_table, mb_array_size * sizeof(uint8_t))
197
21abf1b20016 different fix, s->mbintra_table used only if h263_pred set. - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents: 196
diff changeset
750 }
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
751
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
752 if (s->h263_pred || s->h263_plus || !s->encoding) {
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
753 /* dc values */
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
754 //MN: we need these for error resilience of intra-frames
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
755 CHECKED_ALLOCZ(s->dc_val_base, yc_size * sizeof(int16_t));
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
756 s->dc_val[0] = s->dc_val_base + s->b8_stride + 1;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
757 s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1;
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
758 s->dc_val[2] = s->dc_val[1] + c_size;
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
759 for(i=0;i<yc_size;i++)
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
760 s->dc_val_base[i] = 1024;
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
761 }
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
762
611
3214d3f4519e error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents: 608
diff changeset
763 /* which mb is a intra block */
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
764 CHECKED_ALLOCZ(s->mbintra_table, mb_array_size);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
765 memset(s->mbintra_table, 1, mb_array_size);
611
3214d3f4519e error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents: 608
diff changeset
766
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
767 /* init macroblock skip table */
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
768 CHECKED_ALLOCZ(s->mbskip_table, mb_array_size+2);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
769 //Note the +1 is for a quicker mpeg4 slice_end detection
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
770 CHECKED_ALLOCZ(s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
771
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 828
diff changeset
772 s->parse_context.state= -1;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
773 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
774 s->visualization_buffer[0] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH);
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
775 s->visualization_buffer[1] = av_malloc((s->mb_width*8 + EDGE_WIDTH) * s->mb_height*8 + EDGE_WIDTH);
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
776 s->visualization_buffer[2] = av_malloc((s->mb_width*8 + EDGE_WIDTH) * s->mb_height*8 + EDGE_WIDTH);
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
777 }
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 828
diff changeset
778
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
779 s->context_initialized = 1;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
780
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
781 s->thread_context[0]= s;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
782 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
783 s->thread_context[i]= av_malloc(sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
784 memcpy(s->thread_context[i], s, sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
785 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
786
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
787 for(i=0; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
788 if(init_duplicate_context(s->thread_context[i], s) < 0)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
789 goto fail;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
790 s->thread_context[i]->start_mb_y= (s->mb_height*(i ) + s->avctx->thread_count/2) / s->avctx->thread_count;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
791 s->thread_context[i]->end_mb_y = (s->mb_height*(i+1) + s->avctx->thread_count/2) / s->avctx->thread_count;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
792 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
793
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
794 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
795 fail:
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
796 MPV_common_end(s);
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
797 return -1;
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
798 }
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
799
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
800 /* init common structure for both encoder and decoder */
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
801 void MPV_common_end(MpegEncContext *s)
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
802 {
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
803 int i, j, k;
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
804
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
805 for(i=0; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
806 free_duplicate_context(s->thread_context[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
807 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
808 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
809 av_freep(&s->thread_context[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
810 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
811
1344
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
812 av_freep(&s->parse_context.buffer);
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
813 s->parse_context.buffer_size=0;
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
814
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
815 av_freep(&s->mb_type);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
816 av_freep(&s->p_mv_table_base);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
817 av_freep(&s->b_forw_mv_table_base);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
818 av_freep(&s->b_back_mv_table_base);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
819 av_freep(&s->b_bidir_forw_mv_table_base);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
820 av_freep(&s->b_bidir_back_mv_table_base);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
821 av_freep(&s->b_direct_mv_table_base);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
822 s->p_mv_table= NULL;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
823 s->b_forw_mv_table= NULL;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
824 s->b_back_mv_table= NULL;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
825 s->b_bidir_forw_mv_table= NULL;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
826 s->b_bidir_back_mv_table= NULL;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
827 s->b_direct_mv_table= NULL;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
828 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
829 for(j=0; j<2; j++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
830 for(k=0; k<2; k++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
831 av_freep(&s->b_field_mv_table_base[i][j][k]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
832 s->b_field_mv_table[i][j][k]=NULL;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
833 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
834 av_freep(&s->b_field_select_table[i][j]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
835 av_freep(&s->p_field_mv_table_base[i][j]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
836 s->p_field_mv_table[i][j]=NULL;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
837 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
838 av_freep(&s->p_field_select_table[i]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
839 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
840
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
841 av_freep(&s->dc_val_base);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
842 av_freep(&s->ac_val_base);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
843 av_freep(&s->coded_block_base);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
844 av_freep(&s->mbintra_table);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
845 av_freep(&s->cbp_table);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
846 av_freep(&s->pred_dir_table);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
847
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
848 av_freep(&s->mbskip_table);
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
849 av_freep(&s->prev_pict_types);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
850 av_freep(&s->bitstream_buffer);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
851 s->allocated_bitstream_buffer_size=0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
852
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
853 av_freep(&s->avctx->stats_out);
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
854 av_freep(&s->ac_stats);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
855 av_freep(&s->error_status_table);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
856 av_freep(&s->mb_index2xy);
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
857 av_freep(&s->lambda_table);
1553
541681146f83 move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents: 1552
diff changeset
858 av_freep(&s->q_intra_matrix);
541681146f83 move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents: 1552
diff changeset
859 av_freep(&s->q_inter_matrix);
1554
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
860 av_freep(&s->q_intra_matrix16);
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
861 av_freep(&s->q_inter_matrix16);
1556
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
862 av_freep(&s->input_picture);
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
863 av_freep(&s->reordered_input_picture);
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
864 av_freep(&s->dct_offset);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
865
1573
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
866 if(s->picture){
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
867 for(i=0; i<MAX_PICTURE_COUNT; i++){
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
868 free_picture(s, &s->picture[i]);
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
869 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
870 }
1552
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
871 av_freep(&s->picture);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
872 s->context_initialized = 0;
1523
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
873 s->last_picture_ptr=
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
874 s->next_picture_ptr=
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
875 s->current_picture_ptr= NULL;
2231
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
876 s->linesize= s->uvlinesize= 0;
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
877
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
878 for(i=0; i<3; i++)
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
879 av_freep(&s->visualization_buffer[i]);
2231
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
880
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
881 avcodec_default_free_buffers(s->avctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
882 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
883
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
884 #ifdef CONFIG_ENCODERS
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
885
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
886 /* init video encoder */
986e461dc072 Initial revision
glantau
parents:
diff changeset
887 int MPV_encode_init(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
888 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
889 MpegEncContext *s = avctx->priv_data;
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
890 int i, dummy;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
891 int chroma_h_shift, chroma_v_shift;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
893 MPV_encode_defaults(s);
315
40d8092e2ff0 * using pixtype as enum - by Philip Gladstone
kabi
parents: 312
diff changeset
894
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
895 if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUV420P){
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
896 av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n");
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
897 return -1;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
898 }
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
899
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
900 if(avctx->codec_id == CODEC_ID_MJPEG || avctx->codec_id == CODEC_ID_LJPEG){
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
901 if(avctx->strict_std_compliance>=0 && avctx->pix_fmt != PIX_FMT_YUVJ420P){
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
902 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n");
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
903 return -1;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
904 }
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
905 }else{
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
906 if(avctx->strict_std_compliance>=0 && avctx->pix_fmt != PIX_FMT_YUV420P){
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
907 av_log(avctx, AV_LOG_ERROR, "colorspace not supported\n");
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
908 return -1;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
909 }
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
910 }
1402
f662e9c86cf2 * fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents: 1397
diff changeset
911
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
912 s->bit_rate = avctx->bit_rate;
986e461dc072 Initial revision
glantau
parents:
diff changeset
913 s->width = avctx->width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
914 s->height = avctx->height;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
915 if(avctx->gop_size > 600){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
916 av_log(avctx, AV_LOG_ERROR, "Warning keyframe interval too large! reducing it ...\n");
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
917 avctx->gop_size=600;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
918 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
919 s->gop_size = avctx->gop_size;
194
27d1773552c9 mpeg4 encoder fix by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents: 191
diff changeset
920 s->avctx = avctx;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
921 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
922 s->flags2= avctx->flags2;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
923 s->max_b_frames= avctx->max_b_frames;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
924 s->codec_id= avctx->codec->id;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
925 s->luma_elim_threshold = avctx->luma_elim_threshold;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
926 s->chroma_elim_threshold= avctx->chroma_elim_threshold;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
927 s->strict_std_compliance= avctx->strict_std_compliance;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
928 s->data_partitioning= avctx->flags & CODEC_FLAG_PART;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
929 s->quarter_sample= (avctx->flags & CODEC_FLAG_QPEL)!=0;
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
930 s->mpeg_quant= avctx->mpeg_quant;
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
931 s->rtp_mode= !!avctx->rtp_payload_size;
1992
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1991
diff changeset
932 s->intra_dc_precision= avctx->intra_dc_precision;
2243
b8bad8bbbc64 check if the user specified timestamps are strictly monotone
michael
parents: 2235
diff changeset
933 s->user_specified_pts = AV_NOPTS_VALUE;
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
934
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
935 if (s->gop_size <= 1) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
936 s->intra_only = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
937 s->gop_size = 12;
986e461dc072 Initial revision
glantau
parents:
diff changeset
938 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
939 s->intra_only = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
940 }
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
941
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
942 s->me_method = avctx->me_method;
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
943
320
cda7d0857baf - ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents: 315
diff changeset
944 /* Fixed QSCALE */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
945 s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE);
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
946
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
947 s->adaptive_quant= ( s->avctx->lumi_masking
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
948 || s->avctx->dark_masking
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
949 || s->avctx->temporal_cplx_masking
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
950 || s->avctx->spatial_cplx_masking
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
951 || s->avctx->p_masking
2493
258120c61eea Border processing adaptive quant patch by (Christophe Massiot |cmassiot freebox fr)
michael
parents: 2492
diff changeset
952 || s->avctx->border_masking
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
953 || (s->flags&CODEC_FLAG_QP_RD))
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
954 && !s->fixed_qscale;
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
955
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
956 s->obmc= !!(s->flags & CODEC_FLAG_OBMC);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
957 s->loop_filter= !!(s->flags & CODEC_FLAG_LOOP_FILTER);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
958 s->alternate_scan= !!(s->flags & CODEC_FLAG_ALT_SCAN);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
959
1711
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
960 if(avctx->rc_max_rate && !avctx->rc_buffer_size){
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
961 av_log(avctx, AV_LOG_ERROR, "a vbv buffer size is needed, for encoding with a maximum bitrate\n");
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
962 return -1;
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
963 }
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
964
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
965 if(avctx->rc_min_rate && avctx->rc_max_rate != avctx->rc_min_rate){
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
966 av_log(avctx, AV_LOG_INFO, "Warning min_rate > 0 but min_rate != max_rate isnt recommanded!\n");
1907
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
967 }
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
968
2063
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
969 if(avctx->rc_min_rate && avctx->rc_min_rate > avctx->bit_rate){
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
970 av_log(avctx, AV_LOG_INFO, "bitrate below min bitrate\n");
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
971 return -1;
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
972 }
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
973
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
974 if(avctx->rc_max_rate && avctx->rc_max_rate < avctx->bit_rate){
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
975 av_log(avctx, AV_LOG_INFO, "bitrate above max bitrate\n");
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
976 return -1;
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
977 }
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
978
1907
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
979 if( s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
980 && (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO)
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
981 && 90000LL * (avctx->rc_buffer_size-1) > s->avctx->rc_max_rate*0xFFFFLL){
1711
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
982
1907
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
983 av_log(avctx, AV_LOG_INFO, "Warning vbv_delay will be set to 0xFFFF (=VBR) as the specified vbv buffer is too large for the given bitrate!\n");
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
984 }
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
985
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
986 if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4
1790
be1f5b6137e1 - made --extra-cflags option work on darwin
michael
parents: 1786
diff changeset
987 && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P && s->codec_id != CODEC_ID_FLV1){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
988 av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
989 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
990 }
1711
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
991
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
992 if(s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
993 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with simple mb decission\n");
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
994 return -1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
995 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
996
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
997 if(s->obmc && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
998 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with H263(+)\n");
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
999 return -1;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1000 }
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1001
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1002 if(s->quarter_sample && s->codec_id != CODEC_ID_MPEG4){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1003 av_log(avctx, AV_LOG_ERROR, "qpel not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1004 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1005 }
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1006
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1007 if(s->data_partitioning && s->codec_id != CODEC_ID_MPEG4){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1008 av_log(avctx, AV_LOG_ERROR, "data partitioning not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1009 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1010 }
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1011
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1012 if(s->max_b_frames && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1013 av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1014 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1015 }
1958
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1016
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1017 if((s->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN))
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1018 && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO){
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1019 av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1020 return -1;
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1021 }
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1022
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1023 if(s->mpeg_quant && s->codec_id != CODEC_ID_MPEG4){ //FIXME mpeg2 uses that too
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1024 av_log(avctx, AV_LOG_ERROR, "mpeg2 style quantization not supporetd by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1025 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1026 }
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
1027
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
1028 if((s->flags & CODEC_FLAG_CBP_RD) && !(s->flags & CODEC_FLAG_TRELLIS_QUANT)){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1029 av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n");
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
1030 return -1;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
1031 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
1032
1622
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1033 if((s->flags & CODEC_FLAG_QP_RD) && s->avctx->mb_decision != FF_MB_DECISION_RD){
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1034 av_log(avctx, AV_LOG_ERROR, "QP RD needs mbd=2\n");
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1035 return -1;
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1036 }
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1037
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
1038 if(s->avctx->scenechange_threshold < 1000000000 && (s->flags & CODEC_FLAG_CLOSED_GOP)){
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
1039 av_log(avctx, AV_LOG_ERROR, "closed gop with scene change detection arent supported yet\n");
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
1040 return -1;
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
1041 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1042
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1043 if(s->avctx->thread_count > 1 && s->codec_id != CODEC_ID_MPEG4
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1044 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1045 && (s->codec_id != CODEC_ID_H263P || !(s->flags & CODEC_FLAG_H263P_SLICE_STRUCT))){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1046 av_log(avctx, AV_LOG_ERROR, "multi threaded encoding not supported by codec\n");
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1047 return -1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1048 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1049
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1050 if(s->avctx->thread_count > 1)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1051 s->rtp_mode= 1;
1760
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1052
2450
e248c6250232 framerate check
michael
parents: 2442
diff changeset
1053 if(!avctx->frame_rate || !avctx->frame_rate_base){
e248c6250232 framerate check
michael
parents: 2442
diff changeset
1054 av_log(avctx, AV_LOG_ERROR, "framerate not set\n");
e248c6250232 framerate check
michael
parents: 2442
diff changeset
1055 return -1;
e248c6250232 framerate check
michael
parents: 2442
diff changeset
1056 }
e248c6250232 framerate check
michael
parents: 2442
diff changeset
1057
1760
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1058 i= ff_gcd(avctx->frame_rate, avctx->frame_rate_base);
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1059 if(i > 1){
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1060 av_log(avctx, AV_LOG_INFO, "removing common factors from framerate\n");
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1061 avctx->frame_rate /= i;
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1062 avctx->frame_rate_base /= i;
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1063 // return -1;
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1064 }
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
1065
1150
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1066 if(s->codec_id==CODEC_ID_MJPEG){
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1067 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1068 s->inter_quant_bias= 0;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1069 }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
1070 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1071 s->inter_quant_bias= 0;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1072 }else{
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1073 s->intra_quant_bias=0;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1074 s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1075 }
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1076
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1077 if(avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1078 s->intra_quant_bias= avctx->intra_quant_bias;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1079 if(avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1080 s->inter_quant_bias= avctx->inter_quant_bias;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1081
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1082 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
1083
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
1084 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
1085 s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1;
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
1086
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1087 switch(avctx->codec->id) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1088 case CODEC_ID_MPEG1VIDEO:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1089 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
1090 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
1091 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1092 break;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1093 case CODEC_ID_MPEG2VIDEO:
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1094 s->out_format = FMT_MPEG1;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1095 s->low_delay= 0; //s->max_b_frames ? 0 : 1;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1096 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
1097 s->rtp_mode= 1;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1098 break;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1099 case CODEC_ID_LJPEG:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1100 case CODEC_ID_MJPEG:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1101 s->out_format = FMT_MJPEG;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1102 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
1103 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
1104 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
1105 s->mjpeg_vsample[0] = 1<<chroma_v_shift;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1106 s->mjpeg_vsample[1] = 1;
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
1107 s->mjpeg_vsample[2] = 1;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1108 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
1109 s->mjpeg_hsample[1] = 1;
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
1110 s->mjpeg_hsample[2] = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1111 if (mjpeg_init(s) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1112 return -1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1113 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1114 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1115 break;
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1116 case CODEC_ID_H261:
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1117 s->out_format = FMT_H261;
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1118 avctx->delay=0;
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1119 s->low_delay=1;
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1120 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1121 case CODEC_ID_H263:
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
1122 if (h263_get_picture_format(s->width, s->height) == 7) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1123 av_log(avctx, AV_LOG_INFO, "Input picture size isn't suitable for h263 codec! try h263+\n");
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1124 return -1;
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
1125 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1126 s->out_format = FMT_H263;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1127 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1128 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1129 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1130 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1131 case CODEC_ID_H263P:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1132 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1133 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
1134 /* Fx */
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1135 s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0;
1095
c7604e6291c5 extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents: 1094
diff changeset
1136 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1137 s->modified_quant= s->h263_aic;
1637
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
1138 s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1139 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1140 s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1141 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
1142 s->h263_slice_structured= (s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) ? 1:0;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1143
1095
c7604e6291c5 extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents: 1094
diff changeset
1144 /* /Fx */
79
82e579c37bc3 Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents: 78
diff changeset
1145 /* These are just to be sure */
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1146 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1147 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1148 break;
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1149 case CODEC_ID_FLV1:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1150 s->out_format = FMT_H263;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1151 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
1152 s->unrestricted_mv = 1;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1153 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
1154 avctx->delay=0;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1155 s->low_delay=1;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1156 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1157 case CODEC_ID_RV10:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1158 s->out_format = FMT_H263;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1159 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1160 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1161 break;
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1162 case CODEC_ID_RV20:
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1163 s->out_format = FMT_H263;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1164 avctx->delay=0;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1165 s->low_delay=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1166 s->modified_quant=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1167 s->h263_aic=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1168 s->h263_plus=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1169 s->loop_filter=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1170 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1171 break;
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
1172 case CODEC_ID_MPEG4:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1173 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1174 s->h263_pred = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1175 s->unrestricted_mv = 1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1176 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
1177 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1178 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1179 case CODEC_ID_MSMPEG4V1:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1180 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1181 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1182 s->h263_pred = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1183 s->unrestricted_mv = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1184 s->msmpeg4_version= 1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1185 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1186 s->low_delay=1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1187 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1188 case CODEC_ID_MSMPEG4V2:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1189 s->out_format = FMT_H263;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1190 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1191 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1192 s->unrestricted_mv = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1193 s->msmpeg4_version= 2;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1194 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1195 s->low_delay=1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1196 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1197 case CODEC_ID_MSMPEG4V3:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1198 s->out_format = FMT_H263;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1199 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1200 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1201 s->unrestricted_mv = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1202 s->msmpeg4_version= 3;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
1203 s->flipflop_rounding=1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1204 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1205 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1206 break;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1207 case CODEC_ID_WMV1:
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1208 s->out_format = FMT_H263;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1209 s->h263_msmpeg4 = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1210 s->h263_pred = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1211 s->unrestricted_mv = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1212 s->msmpeg4_version= 4;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
1213 s->flipflop_rounding=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1214 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1215 s->low_delay=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1216 break;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1217 case CODEC_ID_WMV2:
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1218 s->out_format = FMT_H263;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1219 s->h263_msmpeg4 = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1220 s->h263_pred = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1221 s->unrestricted_mv = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1222 s->msmpeg4_version= 5;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
1223 s->flipflop_rounding=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1224 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1225 s->low_delay=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1226 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1227 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1228 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1229 }
2042
87620c5e2b03 export low_delay for encoding too
michael
parents: 2025
diff changeset
1230
87620c5e2b03 export low_delay for encoding too
michael
parents: 2025
diff changeset
1231 avctx->has_b_frames= !s->low_delay;
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1742
diff changeset
1232
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
1233 s->encoding = 1;
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
1234
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1235 /* init */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1236 if (MPV_common_init(s) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1237 return -1;
1678
c962b8db3715 interlaced dct encoding fix
michael
parents: 1676
diff changeset
1238
c962b8db3715 interlaced dct encoding fix
michael
parents: 1676
diff changeset
1239 if(s->modified_quant)
c962b8db3715 interlaced dct encoding fix
michael
parents: 1676
diff changeset
1240 s->chroma_qscale_table= ff_h263_chroma_qscale_table;
c962b8db3715 interlaced dct encoding fix
michael
parents: 1676
diff changeset
1241 s->progressive_frame=
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
1242 s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME));
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1243 s->quant_precision=5;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1244
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
1245 ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp);
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
1246 ff_set_cmp(&s->dsp, s->dsp.frame_skip_cmp, s->avctx->frame_skip_cmp);
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
1247
815
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 814
diff changeset
1248 #ifdef CONFIG_ENCODERS
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1249 if (s->out_format == FMT_H261)
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1250 ff_h261_encode_init(s);
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1251 if (s->out_format == FMT_H263)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1252 h263_encode_init(s);
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1253 if(s->msmpeg4_version)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1254 ff_msmpeg4_encode_init(s);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1255 if (s->out_format == FMT_MPEG1)
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1256 ff_mpeg1_encode_init(s);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1257 #endif
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1258
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
1259 /* init q matrix */
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
1260 for(i=0;i<64;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
1261 int j= s->dsp.idct_permutation[i];
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
1262 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
1263 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
1264 s->inter_matrix[j] = ff_mpeg4_default_non_intra_matrix[i];
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1265 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1266 s->intra_matrix[j] =
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1267 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1268 }else
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1269 { /* mpeg1/2 */
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1270 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
1271 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i];
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
1272 }
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
1273 if(s->avctx->intra_matrix)
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
1274 s->intra_matrix[j] = s->avctx->intra_matrix[i];
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
1275 if(s->avctx->inter_matrix)
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
1276 s->inter_matrix[j] = s->avctx->inter_matrix[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
1277 }
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
1278
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
1279 /* precompute matrix */
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
1280 /* for mjpeg, we do include qscale in the matrix */
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
1281 if (s->out_format != FMT_MJPEG) {
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
1282 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16,
2385
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
1283 s->intra_matrix, s->intra_quant_bias, avctx->qmin, 31, 1);
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
1284 convert_matrix(&s->dsp, s->q_inter_matrix, s->q_inter_matrix16,
2385
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
1285 s->inter_matrix, s->inter_quant_bias, avctx->qmin, 31, 0);
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
1286 }
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
1287
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1288 if(ff_rate_control_init(s) < 0)
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1289 return -1;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
1290
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1291 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1292 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1293
986e461dc072 Initial revision
glantau
parents:
diff changeset
1294 int MPV_encode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1295 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1296 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1297
986e461dc072 Initial revision
glantau
parents:
diff changeset
1298 #ifdef STATS
986e461dc072 Initial revision
glantau
parents:
diff changeset
1299 print_stats();
986e461dc072 Initial revision
glantau
parents:
diff changeset
1300 #endif
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1301
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1302 ff_rate_control_uninit(s);
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1303
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1304 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1305 if (s->out_format == FMT_MJPEG)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1306 mjpeg_close(s);
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
1307
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
1308 av_freep(&avctx->extradata);
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
1309
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1310 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1311 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1312
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
1313 #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
1314
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1315 void init_rl(RLTable *rl, int use_static)
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1316 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1317 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1318 uint8_t index_run[MAX_RUN+1];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1319 int last, run, level, start, end, i;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1320
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1321 /* If table is static, we can quit if rl->max_level[0] is not NULL */
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1322 if(use_static && rl->max_level[0])
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1323 return;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1324
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1325 /* compute max_level[], max_run[] and index_run[] */
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1326 for(last=0;last<2;last++) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1327 if (last == 0) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1328 start = 0;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1329 end = rl->last;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1330 } else {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1331 start = rl->last;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1332 end = rl->n;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1333 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1334
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1335 memset(max_level, 0, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1336 memset(max_run, 0, MAX_LEVEL + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1337 memset(index_run, rl->n, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1338 for(i=start;i<end;i++) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1339 run = rl->table_run[i];
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1340 level = rl->table_level[i];
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1341 if (index_run[run] == rl->n)
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1342 index_run[run] = i;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1343 if (level > max_level[run])
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1344 max_level[run] = level;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1345 if (run > max_run[level])
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1346 max_run[level] = run;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1347 }
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1348 if(use_static)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1349 rl->max_level[last] = av_mallocz_static(MAX_RUN + 1);
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1350 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1351 rl->max_level[last] = av_malloc(MAX_RUN + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1352 memcpy(rl->max_level[last], max_level, MAX_RUN + 1);
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1353 if(use_static)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1354 rl->max_run[last] = av_mallocz_static(MAX_LEVEL + 1);
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1355 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1356 rl->max_run[last] = av_malloc(MAX_LEVEL + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1357 memcpy(rl->max_run[last], max_run, MAX_LEVEL + 1);
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1358 if(use_static)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1359 rl->index_run[last] = av_mallocz_static(MAX_RUN + 1);
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1360 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1361 rl->index_run[last] = av_malloc(MAX_RUN + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1362 memcpy(rl->index_run[last], index_run, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1363 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1364 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1365
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1366 /* 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
1367 //FIXME check that this is ok for mpeg4 interlaced
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1368 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1369 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1370 uint8_t *ptr, *last_line;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1371 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1372
986e461dc072 Initial revision
glantau
parents:
diff changeset
1373 last_line = buf + (height - 1) * wrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1374 for(i=0;i<w;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1375 /* top and bottom */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1376 memcpy(buf - (i + 1) * wrap, buf, width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1377 memcpy(last_line + (i + 1) * wrap, last_line, width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1378 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1379 /* left and right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1380 ptr = buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1381 for(i=0;i<height;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1382 memset(ptr - w, ptr[0], w);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1383 memset(ptr + width, ptr[width-1], w);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1384 ptr += wrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1385 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1386 /* corners */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1387 for(i=0;i<w;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1388 memset(buf - (i + 1) * wrap - w, buf[0], w); /* top left */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1389 memset(buf - (i + 1) * wrap + width, buf[width-1], w); /* top right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1390 memset(last_line + (i + 1) * wrap - w, last_line[0], w); /* top left */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1391 memset(last_line + (i + 1) * wrap + width, last_line[width-1], w); /* top right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1392 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1393 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1394
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1395 int ff_find_unused_picture(MpegEncContext *s, int shared){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1396 int i;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1397
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1398 if(shared){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1399 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1400 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) return i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1401 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1402 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1403 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1404 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) return i; //FIXME
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1405 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1406 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1407 if(s->picture[i].data[0]==NULL) return i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1408 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1409 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1410
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1411 assert(0);
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1412 return -1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1413 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1414
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1415 static void update_noise_reduction(MpegEncContext *s){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1416 int intra, i;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1417
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1418 for(intra=0; intra<2; intra++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1419 if(s->dct_count[intra] > (1<<16)){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1420 for(i=0; i<64; i++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1421 s->dct_error_sum[intra][i] >>=1;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1422 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1423 s->dct_count[intra] >>= 1;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1424 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1425
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1426 for(i=0; i<64; i++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1427 s->dct_offset[intra][i]= (s->avctx->noise_reduction * s->dct_count[intra] + s->dct_error_sum[intra][i]/2) / (s->dct_error_sum[intra][i]+1);
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1428 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1429 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1430 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1431
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1432 /**
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1433 * 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
1434 */
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1435 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1436 {
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1437 int i;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1438 AVFrame *pic;
46
931417475f5b fixed mpeg1 first block bug (pb with black picture optimisation for B frames)
glantau
parents: 40
diff changeset
1439 s->mb_skiped = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1440
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1228
diff changeset
1441 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
1442
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1443 /* mark&release old frames */
1944
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1444 if (s->pict_type != B_TYPE && s->last_picture_ptr && s->last_picture_ptr != s->next_picture_ptr && s->last_picture_ptr->data[0]) {
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1445 avctx->release_buffer(avctx, (AVFrame*)s->last_picture_ptr);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1446
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1447 /* release forgotten pictures */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1448 /* if(mpeg124/h263) */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1449 if(!s->encoding){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1450 for(i=0; i<MAX_PICTURE_COUNT; i++){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1451 if(s->picture[i].data[0] && &s->picture[i] != s->next_picture_ptr && s->picture[i].reference){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1452 av_log(avctx, AV_LOG_ERROR, "releasing zombie picture\n");
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1453 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1454 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1455 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1456 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1457 }
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1458 alloc:
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1459 if(!s->encoding){
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1460 /* release non refernce frames */
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1461 for(i=0; i<MAX_PICTURE_COUNT; i++){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1462 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
1463 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]);
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1464 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1465 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1466
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1467 if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL)
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1468 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
1469 else{
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1470 i= ff_find_unused_picture(s, 0);
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1471 pic= (AVFrame*)&s->picture[i];
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1472 }
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1473
1944
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1474 pic->reference= s->pict_type != B_TYPE && !s->dropable ? 3 : 0;
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1475
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
1476 pic->coded_picture_number= s->coded_picture_number++;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1477
1384
18cdce49339e make MPV_frame_start fail on get_buffer failer
iive
parents: 1381
diff changeset
1478 if( alloc_picture(s, (Picture*)pic, 0) < 0)
18cdce49339e make MPV_frame_start fail on get_buffer failer
iive
parents: 1381
diff changeset
1479 return -1;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1480
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1481 s->current_picture_ptr= (Picture*)pic;
1658
d4637a0eaab1 export top_field_first & interlaced_frame
michael
parents: 1655
diff changeset
1482 s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic
1659
3075fc11a974 AVFrame.interlaced_frame fixes
michael
parents: 1658
diff changeset
1483 s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1484 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1485
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
1486 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
1487 // 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
1488 // 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
1489 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE;
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
1490
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
1491 copy_picture(&s->current_picture, s->current_picture_ptr);
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
1492
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1228
diff changeset
1493 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1494 if (s->pict_type != B_TYPE) {
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1495 s->last_picture_ptr= s->next_picture_ptr;
1944
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1496 if(!s->dropable)
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1497 s->next_picture_ptr= s->current_picture_ptr;
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1498 }
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1499 /* av_log(s->avctx, AV_LOG_DEBUG, "L%p N%p C%p L%p N%p C%p type:%d drop:%d\n", s->last_picture_ptr, s->next_picture_ptr,s->current_picture_ptr,
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1500 s->last_picture_ptr ? s->last_picture_ptr->data[0] : NULL,
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1501 s->next_picture_ptr ? s->next_picture_ptr->data[0] : NULL,
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1502 s->current_picture_ptr ? s->current_picture_ptr->data[0] : NULL,
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1503 s->pict_type, s->dropable);*/
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
1504
1539
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
1505 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
1506 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
1507
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
1508 if(s->pict_type != I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL)){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1509 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n");
1393
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1510 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
1511 goto alloc;
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1512 }
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1513
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1514 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
1515
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1516 if(s->picture_structure!=PICT_FRAME){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1517 int i;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1518 for(i=0; i<4; i++){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1519 if(s->picture_structure == PICT_BOTTOM_FIELD){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1520 s->current_picture.data[i] += s->current_picture.linesize[i];
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1521 }
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1522 s->current_picture.linesize[i] *= 2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1523 s->last_picture.linesize[i] *=2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1524 s->next_picture.linesize[i] *=2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1525 }
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1526 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1527 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1528
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1529 s->hurry_up= s->avctx->hurry_up;
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1530 s->error_resilience= avctx->error_resilience;
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1531
591
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 588
diff changeset
1532 /* set dequantizer, we cant do it during init as it might change for mpeg4
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 588
diff changeset
1533 and we cant do it in the header decode as init isnt called for mpeg4 there yet */
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1534 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1535 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1536 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter;
2345
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
1537 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1538 s->dct_unquantize_intra = s->dct_unquantize_h263_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1539 s->dct_unquantize_inter = s->dct_unquantize_h263_inter;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1540 }else{
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1541 s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1542 s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1543 }
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1544
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1545 if(s->dct_error_sum){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1546 assert(s->avctx->noise_reduction && s->encoding);
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1547
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1548 update_noise_reduction(s);
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1549 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1550
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1551 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1552 if(s->avctx->xvmc_acceleration)
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1553 return XVMC_field_start(s, avctx);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1554 #endif
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1555 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1556 }
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
1557
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1558 /* generic function for encode/decode called after a frame has been coded/decoded */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1559 void MPV_frame_end(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1560 {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1561 int i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1562 /* draw edge for correct motion prediction if outside */
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1563 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1564 //just to make sure that all data is rendered.
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1565 if(s->avctx->xvmc_acceleration){
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1566 XVMC_field_end(s);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1567 }else
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1568 #endif
1542
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
1569 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
1570 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
1571 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
1572 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
1573 }
207
6954f2830e4a (commit by michael)
arpi_esp
parents: 206
diff changeset
1574 emms_c();
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1575
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
1576 s->last_pict_type = s->pict_type;
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1577 if(s->pict_type!=B_TYPE){
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1578 s->last_non_b_pict_type= s->pict_type;
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1579 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1580 #if 0
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1581 /* copy back current_picture variables */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1582 for(i=0; i<MAX_PICTURE_COUNT; i++){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1583 if(s->picture[i].data[0] == s->current_picture.data[0]){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1584 s->picture[i]= s->current_picture;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1585 break;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1586 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1587 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1588 assert(i<MAX_PICTURE_COUNT);
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1589 #endif
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1590
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1591 if(s->encoding){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1592 /* release non refernce frames */
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1593 for(i=0; i<MAX_PICTURE_COUNT; i++){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1594 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
1595 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]);
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1596 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1597 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1598 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1599 // clear copies, to avoid confusion
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1600 #if 0
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1601 memset(&s->last_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1602 memset(&s->next_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1603 memset(&s->current_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1604 #endif
2213
c17d0cbbdf66 10l (wrong coded_picture)
michael
parents: 2168
diff changeset
1605 s->avctx->coded_frame= (AVFrame*)s->current_picture_ptr;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1606 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1607
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
1608 /**
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1609 * draws an line from (ex, ey) -> (sx, sy).
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1610 * @param w width of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1611 * @param h height of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1612 * @param stride stride/linesize of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1613 * @param color color of the arrow
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1614 */
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1615 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1616 int t, x, y, fr, f;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1617
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1618 sx= clip(sx, 0, w-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1619 sy= clip(sy, 0, h-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1620 ex= clip(ex, 0, w-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1621 ey= clip(ey, 0, h-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1622
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1623 buf[sy*stride + sx]+= color;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1624
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1625 if(ABS(ex - sx) > ABS(ey - sy)){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1626 if(sx > ex){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1627 t=sx; sx=ex; ex=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1628 t=sy; sy=ey; ey=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1629 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1630 buf+= sx + sy*stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1631 ex-= sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1632 f= ((ey-sy)<<16)/ex;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1633 for(x= 0; x <= ex; x++){
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1634 y = (x*f)>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1635 fr= (x*f)&0xFFFF;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1636 buf[ y *stride + x]+= (color*(0x10000-fr))>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1637 buf[(y+1)*stride + x]+= (color* fr )>>16;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1638 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1639 }else{
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1640 if(sy > ey){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1641 t=sx; sx=ex; ex=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1642 t=sy; sy=ey; ey=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1643 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1644 buf+= sx + sy*stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1645 ey-= sy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1646 if(ey) f= ((ex-sx)<<16)/ey;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1647 else f= 0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1648 for(y= 0; y <= ey; y++){
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1649 x = (y*f)>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1650 fr= (y*f)&0xFFFF;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1651 buf[y*stride + x ]+= (color*(0x10000-fr))>>16;;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1652 buf[y*stride + x+1]+= (color* fr )>>16;;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1653 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1654 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1655 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1656
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1657 /**
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1658 * draws an arrow from (ex, ey) -> (sx, sy).
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1659 * @param w width of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1660 * @param h height of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1661 * @param stride stride/linesize of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1662 * @param color color of the arrow
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1663 */
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1664 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
1665 int dx,dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1666
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1667 sx= clip(sx, -100, w+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1668 sy= clip(sy, -100, h+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1669 ex= clip(ex, -100, w+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1670 ey= clip(ey, -100, h+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1671
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1672 dx= ex - sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1673 dy= ey - sy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1674
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1675 if(dx*dx + dy*dy > 3*3){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1676 int rx= dx + dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1677 int ry= -dx + dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1678 int length= ff_sqrt((rx*rx + ry*ry)<<8);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1679
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1680 //FIXME subpixel accuracy
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1681 rx= ROUNDED_DIV(rx*3<<4, length);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1682 ry= ROUNDED_DIV(ry*3<<4, length);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1683
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1684 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
1685 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
1686 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1687 draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1688 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1689
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1690 /**
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
1691 * 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
1692 */
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1693 void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1694
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1695 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
1696
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1697 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
1698 int x,y;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1699
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1700 av_log(s->avctx,AV_LOG_DEBUG,"New frame, type: ");
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1701 switch (pict->pict_type) {
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1702 case FF_I_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"I\n"); break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1703 case FF_P_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"P\n"); break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1704 case FF_B_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"B\n"); break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1705 case FF_S_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"S\n"); break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1706 case FF_SI_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SI\n"); break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1707 case FF_SP_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SP\n"); break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1708 }
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
1709 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
1710 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
1711 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
1712 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
1713 if(count>9) count=9;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1714 av_log(s->avctx, AV_LOG_DEBUG, "%1d", count);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1715 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1716 if(s->avctx->debug&FF_DEBUG_QP){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1717 av_log(s->avctx, AV_LOG_DEBUG, "%2d", pict->qscale_table[x + y*s->mb_stride]);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1718 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1719 if(s->avctx->debug&FF_DEBUG_MB_TYPE){
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1720 int 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
1721 //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
1722 if(IS_PCM(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1723 av_log(s->avctx, AV_LOG_DEBUG, "P");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1724 else if(IS_INTRA(mb_type) && IS_ACPRED(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1725 av_log(s->avctx, AV_LOG_DEBUG, "A");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1726 else if(IS_INTRA4x4(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1727 av_log(s->avctx, AV_LOG_DEBUG, "i");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1728 else if(IS_INTRA16x16(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1729 av_log(s->avctx, AV_LOG_DEBUG, "I");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1730 else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1731 av_log(s->avctx, AV_LOG_DEBUG, "d");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1732 else if(IS_DIRECT(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1733 av_log(s->avctx, AV_LOG_DEBUG, "D");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1734 else if(IS_GMC(mb_type) && IS_SKIP(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1735 av_log(s->avctx, AV_LOG_DEBUG, "g");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1736 else if(IS_GMC(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1737 av_log(s->avctx, AV_LOG_DEBUG, "G");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1738 else if(IS_SKIP(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1739 av_log(s->avctx, AV_LOG_DEBUG, "S");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1740 else if(!USES_LIST(mb_type, 1))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1741 av_log(s->avctx, AV_LOG_DEBUG, ">");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1742 else if(!USES_LIST(mb_type, 0))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1743 av_log(s->avctx, AV_LOG_DEBUG, "<");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1744 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
1745 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1));
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1746 av_log(s->avctx, AV_LOG_DEBUG, "X");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1747 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1748
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1749 //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
1750 if(IS_8X8(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1751 av_log(s->avctx, AV_LOG_DEBUG, "+");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1752 else if(IS_16X8(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1753 av_log(s->avctx, AV_LOG_DEBUG, "-");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1754 else if(IS_8X16(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1755 av_log(s->avctx, AV_LOG_DEBUG, "¦");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1756 else if(IS_INTRA(mb_type) || IS_16X16(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1757 av_log(s->avctx, AV_LOG_DEBUG, " ");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1758 else
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1759 av_log(s->avctx, AV_LOG_DEBUG, "?");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1760
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1761
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1762 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1763 av_log(s->avctx, AV_LOG_DEBUG, "=");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1764 else
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1765 av_log(s->avctx, AV_LOG_DEBUG, " ");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1766 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1767 // av_log(s->avctx, AV_LOG_DEBUG, " ");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1768 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1769 av_log(s->avctx, AV_LOG_DEBUG, "\n");
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1770 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1771 }
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
1772
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1773 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1774 const int shift= 1 + s->quarter_sample;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1775 int mb_y;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1776 uint8_t *ptr;
1707
027545a2fdbe 100000l
michael
parents: 1706
diff changeset
1777 int i;
1723
033d889d7c2c non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1722
diff changeset
1778 int h_chroma_shift, v_chroma_shift;
2266
514949de5d15 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents: 2265
diff changeset
1779 const int width = s->avctx->width;
514949de5d15 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents: 2265
diff changeset
1780 const int height= s->avctx->height;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1781 const int mv_sample_log2= 4 - pict->motion_subsample_log2;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1782 const int mv_stride= (s->mb_width << mv_sample_log2) + 1;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1783 s->low_delay=0; //needed to see the vectors without trashing the buffers
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1784
1723
033d889d7c2c non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1722
diff changeset
1785 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1786 for(i=0; i<3; i++){
2266
514949de5d15 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents: 2265
diff changeset
1787 memcpy(s->visualization_buffer[i], pict->data[i], (i==0) ? pict->linesize[i]*height:pict->linesize[i]*height >> v_chroma_shift);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1788 pict->data[i]= s->visualization_buffer[i];
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1789 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1790 pict->type= FF_BUFFER_TYPE_COPY;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1791 ptr= pict->data[0];
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1792
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1793 for(mb_y=0; mb_y<s->mb_height; mb_y++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1794 int mb_x;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1795 for(mb_x=0; mb_x<s->mb_width; mb_x++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1796 const int mb_index= mb_x + mb_y*s->mb_stride;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1797 if((s->avctx->debug_mv) && pict->motion_val){
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1798 int type;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1799 for(type=0; type<3; type++){
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
1800 int direction = 0;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1801 switch (type) {
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1802 case 0: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_P_FOR)) || (pict->pict_type!=FF_P_TYPE))
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1803 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1804 direction = 0;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1805 break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1806 case 1: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_B_FOR)) || (pict->pict_type!=FF_B_TYPE))
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1807 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1808 direction = 0;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1809 break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1810 case 2: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_B_BACK)) || (pict->pict_type!=FF_B_TYPE))
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1811 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1812 direction = 1;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1813 break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1814 }
1712
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1815 if(!USES_LIST(pict->mb_type[mb_index], direction))
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1816 continue;
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1817
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1818 if(IS_8X8(pict->mb_type[mb_index])){
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1819 int i;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1820 for(i=0; i<4; i++){
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1821 int sx= mb_x*16 + 4 + 8*(i&1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1822 int sy= mb_y*16 + 4 + 8*(i>>1);
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1823 int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << mv_sample_log2-1;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1824 int mx= (pict->motion_val[direction][xy][0]>>shift) + sx;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1825 int my= (pict->motion_val[direction][xy][1]>>shift) + sy;
2266
514949de5d15 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents: 2265
diff changeset
1826 draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1827 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1828 }else if(IS_16X8(pict->mb_type[mb_index])){
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1829 int i;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1830 for(i=0; i<2; i++){
1629
74685a0ec851 16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1628
diff changeset
1831 int sx=mb_x*16 + 8;
74685a0ec851 16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1628
diff changeset
1832 int sy=mb_y*16 + 4 + 8*i;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1833 int xy= (mb_x*2 + (mb_y*2 + i)*mv_stride) << mv_sample_log2-1;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1834 int mx=(pict->motion_val[direction][xy][0]>>shift);
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1835 int my=(pict->motion_val[direction][xy][1]>>shift);
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1836
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1837 if(IS_INTERLACED(pict->mb_type[mb_index]))
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1838 my*=2;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1839
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1840 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100);
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1841 }
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1842 }else if(IS_8X16(pict->mb_type[mb_index])){
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1843 int i;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1844 for(i=0; i<2; i++){
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1845 int sx=mb_x*16 + 4 + 8*i;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1846 int sy=mb_y*16 + 8;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1847 int xy= (mb_x*2 + i + mb_y*2*mv_stride) << mv_sample_log2-1;
1947
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1848 int mx=(pict->motion_val[direction][xy][0]>>shift);
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1849 int my=(pict->motion_val[direction][xy][1]>>shift);
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1850
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1851 if(IS_INTERLACED(pict->mb_type[mb_index]))
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1852 my*=2;
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1853
2266
514949de5d15 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents: 2265
diff changeset
1854 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1855 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1856 }else{
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1857 int sx= mb_x*16 + 8;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1858 int sy= mb_y*16 + 8;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1859 int xy= (mb_x + mb_y*mv_stride) << mv_sample_log2;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1860 int mx= (pict->motion_val[direction][xy][0]>>shift) + sx;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1861 int my= (pict->motion_val[direction][xy][1]>>shift) + sy;
2266
514949de5d15 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents: 2265
diff changeset
1862 draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100);
1629
74685a0ec851 16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1628
diff changeset
1863 }
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1864 }
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1865 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1866 if((s->avctx->debug&FF_DEBUG_VIS_QP) && pict->motion_val){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1867 uint64_t c= (pict->qscale_table[mb_index]*128/31) * 0x0101010101010101ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1868 int y;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1869 for(y=0; y<8; y++){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1870 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= c;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1871 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= c;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1872 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1873 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1874 if((s->avctx->debug&FF_DEBUG_VIS_MB_TYPE) && pict->motion_val){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1875 int mb_type= pict->mb_type[mb_index];
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1876 uint64_t u,v;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1877 int y;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1878 #define COLOR(theta, r)\
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1879 u= (int)(128 + r*cos(theta*3.141592/180));\
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1880 v= (int)(128 + r*sin(theta*3.141592/180));
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1881
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1882
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1883 u=v=128;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1884 if(IS_PCM(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1885 COLOR(120,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1886 }else if((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) || IS_INTRA16x16(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1887 COLOR(30,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1888 }else if(IS_INTRA4x4(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1889 COLOR(90,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1890 }else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1891 // COLOR(120,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1892 }else if(IS_DIRECT(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1893 COLOR(150,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1894 }else if(IS_GMC(mb_type) && IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1895 COLOR(170,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1896 }else if(IS_GMC(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1897 COLOR(190,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1898 }else if(IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1899 // COLOR(180,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1900 }else if(!USES_LIST(mb_type, 1)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1901 COLOR(240,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1902 }else if(!USES_LIST(mb_type, 0)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1903 COLOR(0,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1904 }else{
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1905 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1));
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1906 COLOR(300,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1907 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1908
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1909 u*= 0x0101010101010101ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1910 v*= 0x0101010101010101ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1911 for(y=0; y<8; y++){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1912 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= u;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1913 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= v;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1914 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1915
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1916 //segmentation
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1917 if(IS_8X8(mb_type) || IS_16X8(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1918 *(uint64_t*)(pict->data[0] + 16*mb_x + 0 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1919 *(uint64_t*)(pict->data[0] + 16*mb_x + 8 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1920 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1921 if(IS_8X8(mb_type) || IS_8X16(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1922 for(y=0; y<16; y++)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1923 pict->data[0][16*mb_x + 8 + (16*mb_y + y)*pict->linesize[0]]^= 0x80;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1924 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1925
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1926 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1927 // hmm
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1928 }
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1929 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1930 s->mbskip_table[mb_index]=0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1931 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1932 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1933 }
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
1934 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1935
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
1936 #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
1937
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1938 static int get_sae(uint8_t *src, int ref, int stride){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1939 int x,y;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1940 int acc=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1941
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1942 for(y=0; y<16; y++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1943 for(x=0; x<16; x++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1944 acc+= ABS(src[x+y*stride] - ref);
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1945 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1946 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1947
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1948 return acc;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1949 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1950
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1951 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
1952 int x, y, w, h;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1953 int acc=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1954
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1955 w= s->width &~15;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1956 h= s->height&~15;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1957
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1958 for(y=0; y<h; y+=16){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1959 for(x=0; x<w; x+=16){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1960 int offset= x + y*stride;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
1961 int sad = s->dsp.sad[0](NULL, src + offset, ref + offset, stride, 16);
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1962 int mean= (s->dsp.pix_sum(src + offset, stride) + 128)>>8;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1963 int sae = get_sae(src + offset, mean, stride);
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1964
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1965 acc+= sae + 500 < sad;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1966 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1967 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1968 return acc;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1969 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1970
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1971
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1972 static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1973 AVFrame *pic=NULL;
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1974 int64_t pts;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1975 int i;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1976 const int encoding_delay= s->max_b_frames;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1977 int direct=1;
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1978
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1979 if(pic_arg){
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1980 pts= pic_arg->pts;
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1981 pic_arg->display_picture_number= s->input_picture_number++;
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1982
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1983 if(pts != AV_NOPTS_VALUE){
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1984 if(s->user_specified_pts != AV_NOPTS_VALUE){
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1985 int64_t time= av_rescale(pts, s->avctx->frame_rate, s->avctx->frame_rate_base*(int64_t)AV_TIME_BASE);
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1986 int64_t last= av_rescale(s->user_specified_pts, s->avctx->frame_rate, s->avctx->frame_rate_base*(int64_t)AV_TIME_BASE);
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1987
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1988 if(time <= last){
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1989 av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%Ld, last=%Ld\n", pts, s->user_specified_pts);
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1990 return -1;
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1991 }
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1992 }
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1993 s->user_specified_pts= pts;
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1994 }else{
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1995 if(s->user_specified_pts != AV_NOPTS_VALUE){
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1996 s->user_specified_pts=
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1997 pts= s->user_specified_pts + AV_TIME_BASE*(int64_t)s->avctx->frame_rate_base / s->avctx->frame_rate;
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
1998 av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%Ld)\n", pts);
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
1999 }else{
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
2000 pts= av_rescale(pic_arg->display_picture_number*(int64_t)s->avctx->frame_rate_base, AV_TIME_BASE, s->avctx->frame_rate);
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2001 }
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2002 }
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2003 }
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2004
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2005 if(pic_arg){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2006 if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2007 if(pic_arg->linesize[0] != s->linesize) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2008 if(pic_arg->linesize[1] != s->uvlinesize) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2009 if(pic_arg->linesize[2] != s->uvlinesize) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2010
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
2011 // av_log(AV_LOG_DEBUG, "%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2012
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2013 if(direct){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
2014 i= ff_find_unused_picture(s, 1);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2015
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2016 pic= (AVFrame*)&s->picture[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
2017 pic->reference= 3;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2018
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2019 for(i=0; i<4; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2020 pic->data[i]= pic_arg->data[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2021 pic->linesize[i]= pic_arg->linesize[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2022 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2023 alloc_picture(s, (Picture*)pic, 1);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2024 }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
2025 int offset= 16;
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
2026 i= ff_find_unused_picture(s, 0);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2027
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2028 pic= (AVFrame*)&s->picture[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
2029 pic->reference= 3;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2030
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2031 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
2032
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
2033 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
2034 && 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
2035 && pic->data[2] + offset == pic_arg->data[2]){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2036 // empty
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2037 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2038 int h_chroma_shift, v_chroma_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2039 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2040
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2041 for(i=0; i<3; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2042 int src_stride= pic_arg->linesize[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2043 int dst_stride= i ? s->uvlinesize : s->linesize;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2044 int h_shift= i ? h_chroma_shift : 0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2045 int v_shift= i ? v_chroma_shift : 0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2046 int w= s->width >>h_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2047 int h= s->height>>v_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2048 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
2049 uint8_t *dst= pic->data[i] + offset;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2050
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2051 if(src_stride==dst_stride)
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2052 memcpy(dst, src, src_stride*h);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2053 else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2054 while(h--){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2055 memcpy(dst, src, w);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2056 dst += dst_stride;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2057 src += src_stride;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2058 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2059 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2060 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2061 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2062 }
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
2063 copy_picture_attributes(s, pic, pic_arg);
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
2064 pic->pts= pts; //we set this here to avoid modifiying pic_arg
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2065 }
1829
7ae26b6e197f set AVFrame.pts based upon framerate if its 0
michael
parents: 1827
diff changeset
2066
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2067 /* shift buffer entries */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2068 for(i=1; i<MAX_PICTURE_COUNT /*s->encoding_delay+1*/; i++)
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2069 s->input_picture[i-1]= s->input_picture[i];
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2070
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2071 s->input_picture[encoding_delay]= (Picture*)pic;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2072
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2073 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2074 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2075
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2076 static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2077 int x, y, plane;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2078 int score=0;
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2079 int64_t score64=0;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2080 int64_t threshold;
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2081
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2082 for(plane=0; plane<3; plane++){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2083 const int stride= p->linesize[plane];
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2084 const int bw= plane ? 1 : 2;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2085 for(y=0; y<s->mb_height*bw; y++){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2086 for(x=0; x<s->mb_width*bw; x++){
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2087 int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride), ref->data[plane] + 8*(x + y*stride), stride, 8);
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2088
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2089 switch(s->avctx->frame_skip_exp){
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2090 case 0: score= FFMAX(score, v); break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2091 case 1: score+= ABS(v);break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2092 case 2: score+= v*v;break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2093 case 3: score64+= ABS(v*v*(int64_t)v);break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2094 case 4: score64+= v*v*(int64_t)(v*v);break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2095 }
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2096 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2097 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2098 }
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2099
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2100 if(score) score64= score;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2101
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2102 if(score64 < s->avctx->frame_skip_threshold)
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2103 return 1;
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2104 if(score64 < ((s->avctx->frame_skip_factor * (int64_t)s->lambda)>>8))
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2105 return 1;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2106 return 0;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2107 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2108
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2109 static void select_input_picture(MpegEncContext *s){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2110 int i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2111
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2112 for(i=1; i<MAX_PICTURE_COUNT; i++)
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2113 s->reordered_input_picture[i-1]= s->reordered_input_picture[i];
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2114 s->reordered_input_picture[MAX_PICTURE_COUNT-1]= NULL;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2115
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2116 /* set next picture types & ordering */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2117 if(s->reordered_input_picture[0]==NULL && s->input_picture[0]){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2118 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
2119 s->reordered_input_picture[0]= s->input_picture[0];
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2120 s->reordered_input_picture[0]->pict_type= I_TYPE;
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
2121 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2122 }else{
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2123 int b_frames;
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2124
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2125 if(s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2126 if(skip_check(s, s->input_picture[0], s->next_picture_ptr)){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2127 //av_log(NULL, AV_LOG_DEBUG, "skip %p %Ld\n", s->input_picture[0]->data[0], s->input_picture[0]->pts);
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2128
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2129 if(s->input_picture[0]->type == FF_BUFFER_TYPE_SHARED){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2130 for(i=0; i<4; i++)
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2131 s->input_picture[0]->data[i]= NULL;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2132 s->input_picture[0]->type= 0;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2133 }else{
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2134 assert( s->input_picture[0]->type==FF_BUFFER_TYPE_USER
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2135 || s->input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL);
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2136
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2137 s->avctx->release_buffer(s->avctx, (AVFrame*)s->input_picture[0]);
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2138 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2139
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2140 goto no_output_pic;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2141 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2142 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2143
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2144 if(s->flags&CODEC_FLAG_PASS2){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2145 for(i=0; i<s->max_b_frames+1; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2146 int pict_num= s->input_picture[0]->display_picture_number + i;
2364
f8a229dfa2e8 check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents: 2363
diff changeset
2147
f8a229dfa2e8 check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents: 2363
diff changeset
2148 if(pict_num >= s->rc_context.num_entries)
f8a229dfa2e8 check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents: 2363
diff changeset
2149 break;
2363
e0bda0b8359a Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents: 2345
diff changeset
2150 if(!s->input_picture[i]){
2364
f8a229dfa2e8 check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents: 2363
diff changeset
2151 s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE;
2363
e0bda0b8359a Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents: 2345
diff changeset
2152 break;
e0bda0b8359a Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents: 2345
diff changeset
2153 }
2364
f8a229dfa2e8 check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents: 2363
diff changeset
2154
f8a229dfa2e8 check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents: 2363
diff changeset
2155 s->input_picture[i]->pict_type=
f8a229dfa2e8 check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents: 2363
diff changeset
2156 s->rc_context.entry[pict_num].new_pict_type;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2157 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2158 }
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2159
2297
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2160 if(s->avctx->b_frame_strategy==0){
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2161 b_frames= s->max_b_frames;
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2162 while(b_frames && !s->input_picture[b_frames]) b_frames--;
1687
cdc3d4106fb6 cleanup
michael
parents: 1686
diff changeset
2163 }else if(s->avctx->b_frame_strategy==1){
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2164 for(i=1; i<s->max_b_frames+1; i++){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2165 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2166 s->input_picture[i]->b_frame_score=
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2167 get_intra_count(s, s->input_picture[i ]->data[0],
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2168 s->input_picture[i-1]->data[0], s->linesize) + 1;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2169 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2170 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2171 for(i=0; i<s->max_b_frames; i++){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2172 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
2173 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2174
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2175 b_frames= FFMAX(0, i-1);
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
2176
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2177 /* reset scores */
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2178 for(i=0; i<b_frames+1; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2179 s->input_picture[i]->b_frame_score=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2180 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2181 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
2182 av_log(s->avctx, AV_LOG_ERROR, "illegal b frame strategy\n");
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2183 b_frames=0;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
2184 }
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2185
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2186 emms_c();
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2187 //static int b_count=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2188 //b_count+= b_frames;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
2189 //av_log(s->avctx, AV_LOG_DEBUG, "b_frames: %d\n", b_count);
2297
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2190
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2191 for(i= b_frames - 1; i>=0; i--){
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2192 int type= s->input_picture[i]->pict_type;
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2193 if(type && type != B_TYPE)
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2194 b_frames= i;
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2195 }
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2196 if(s->input_picture[b_frames]->pict_type == B_TYPE && b_frames == s->max_b_frames){
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2197 av_log(s->avctx, AV_LOG_ERROR, "warning, too many bframes in a row\n");
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2198 }
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2199
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2200 if(s->picture_in_gop_number + b_frames >= s->gop_size){
2298
3a8e557a8226 support strictly enforcing gop size
michael
parents: 2297
diff changeset
2201 if((s->flags2 & CODEC_FLAG2_STRICT_GOP) && s->gop_size > s->picture_in_gop_number){
3a8e557a8226 support strictly enforcing gop size
michael
parents: 2297
diff changeset
2202 b_frames= s->gop_size - s->picture_in_gop_number - 1;
3a8e557a8226 support strictly enforcing gop size
michael
parents: 2297
diff changeset
2203 }else{
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2204 if(s->flags & CODEC_FLAG_CLOSED_GOP)
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2205 b_frames=0;
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2206 s->input_picture[b_frames]->pict_type= I_TYPE;
2298
3a8e557a8226 support strictly enforcing gop size
michael
parents: 2297
diff changeset
2207 }
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2208 }
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2209
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2210 if( (s->flags & CODEC_FLAG_CLOSED_GOP)
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2211 && b_frames
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2212 && s->input_picture[b_frames]->pict_type== I_TYPE)
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2213 b_frames--;
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2214
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2215 s->reordered_input_picture[0]= s->input_picture[b_frames];
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2216 if(s->reordered_input_picture[0]->pict_type != I_TYPE)
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2217 s->reordered_input_picture[0]->pict_type= P_TYPE;
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
2218 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2219 for(i=0; i<b_frames; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2220 s->reordered_input_picture[i+1]= s->input_picture[i];
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2221 s->reordered_input_picture[i+1]->pict_type= B_TYPE;
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
2222 s->reordered_input_picture[i+1]->coded_picture_number= s->coded_picture_number++;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2223 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2224 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2225 }
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2226 no_output_pic:
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2227 if(s->reordered_input_picture[0]){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
2228 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
2229
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
2230 copy_picture(&s->new_picture, s->reordered_input_picture[0]);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2231
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2232 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2233 // 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
2234
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
2235 int i= ff_find_unused_picture(s, 0);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2236 Picture *pic= &s->picture[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2237
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2238 /* mark us unused / free shared pic */
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2239 for(i=0; i<4; i++)
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2240 s->reordered_input_picture[0]->data[i]= NULL;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2241 s->reordered_input_picture[0]->type= 0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2242
1702
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
2243 pic->reference = s->reordered_input_picture[0]->reference;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2244
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2245 alloc_picture(s, pic, 0);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2246
1955
5dafb10e0252 reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents: 1948
diff changeset
2247 copy_picture_attributes(s, (AVFrame*)pic, (AVFrame*)s->reordered_input_picture[0]);
5dafb10e0252 reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents: 1948
diff changeset
2248
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2249 s->current_picture_ptr= pic;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2250 }else{
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2251 // input is not a shared pix -> reuse buffer for current_pix
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2252
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2253 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2254 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2255
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2256 s->current_picture_ptr= s->reordered_input_picture[0];
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2257 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
2258 s->new_picture.data[i]+=16;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2259 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2260 }
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
2261 copy_picture(&s->current_picture, s->current_picture_ptr);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2262
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2263 s->picture_number= s->new_picture.display_picture_number;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2264 //printf("dpn:%d\n", s->picture_number);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2265 }else{
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2266 memset(&s->new_picture, 0, sizeof(Picture));
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2267 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2268 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2269
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2270 int MPV_encode_picture(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2271 unsigned char *buf, int buf_size, void *data)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2272 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2273 MpegEncContext *s = avctx->priv_data;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2274 AVFrame *pic_arg = data;
1684
19e781619e3f stuffing to stay above min_bitrate
michael
parents: 1682
diff changeset
2275 int i, stuffing_count;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2276
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
2277 if(avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUVJ420P){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
2278 av_log(avctx, AV_LOG_ERROR, "this codec supports only YUV420P\n");
1397
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
2279 return -1;
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
2280 }
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
2281
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2282 for(i=0; i<avctx->thread_count; i++){
1838
8cdbb74c2f4b 10l (vdpart fix)
michael
parents: 1834
diff changeset
2283 int start_y= s->thread_context[i]->start_mb_y;
8cdbb74c2f4b 10l (vdpart fix)
michael
parents: 1834
diff changeset
2284 int end_y= s->thread_context[i]-> end_mb_y;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2285 int h= s->mb_height;
1838
8cdbb74c2f4b 10l (vdpart fix)
michael
parents: 1834
diff changeset
2286 uint8_t *start= buf + buf_size*start_y/h;
8cdbb74c2f4b 10l (vdpart fix)
michael
parents: 1834
diff changeset
2287 uint8_t *end = buf + buf_size* end_y/h;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2288
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2289 init_put_bits(&s->thread_context[i]->pb, start, end - start);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2290 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2291
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2292 s->picture_in_gop_number++;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2293
2243
b8bad8bbbc64 check if the user specified timestamps are strictly monotone
michael
parents: 2235
diff changeset
2294 if(load_input_picture(s, pic_arg) < 0)
b8bad8bbbc64 check if the user specified timestamps are strictly monotone
michael
parents: 2235
diff changeset
2295 return -1;
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
2296
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2297 select_input_picture(s);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2298
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2299 /* output? */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2300 if(s->new_picture.data[0]){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2301 s->pict_type= s->new_picture.pict_type;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2302 //emms_c();
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2303 //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
2304 MPV_frame_start(s, avctx);
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
2305
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2306 encode_picture(s, s->picture_number);
652
c7647afc3ce5 set pict_type & key_frame on decoding too
michaelni
parents: 651
diff changeset
2307
376
ba9c3b8088c0 - pict_type exported to AVCodecContext
pulento
parents: 370
diff changeset
2308 avctx->real_pict_num = s->picture_number;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2309 avctx->header_bits = s->header_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2310 avctx->mv_bits = s->mv_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2311 avctx->misc_bits = s->misc_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2312 avctx->i_tex_bits = s->i_tex_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2313 avctx->p_tex_bits = s->p_tex_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2314 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
2315 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
2316 avctx->skip_count = s->skip_count;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2317
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2318 MPV_frame_end(s);
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2319
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2320 if (s->out_format == FMT_MJPEG)
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2321 mjpeg_picture_trailer(s);
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
2322
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
2323 if(s->flags&CODEC_FLAG_PASS1)
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
2324 ff_write_pass1_stats(s);
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2325
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2326 for(i=0; i<4; i++){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2327 avctx->error[i] += s->current_picture_ptr->error[i];
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2328 }
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2329
2428
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
2330 if(s->flags&CODEC_FLAG_PASS1)
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
2331 assert(avctx->header_bits + avctx->mv_bits + avctx->misc_bits + avctx->i_tex_bits + avctx->p_tex_bits == put_bits_count(&s->pb));
1684
19e781619e3f stuffing to stay above min_bitrate
michael
parents: 1682
diff changeset
2332 flush_put_bits(&s->pb);
1801
3f26dfb3eba4 replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents: 1799
diff changeset
2333 s->frame_bits = put_bits_count(&s->pb);
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2334
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2335 stuffing_count= ff_vbv_update(s, s->frame_bits);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2336 if(stuffing_count){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2337 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < stuffing_count + 50){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2338 av_log(s->avctx, AV_LOG_ERROR, "stuffing too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2339 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2340 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2341
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2342 switch(s->codec_id){
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2343 case CODEC_ID_MPEG1VIDEO:
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2344 case CODEC_ID_MPEG2VIDEO:
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2345 while(stuffing_count--){
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2346 put_bits(&s->pb, 8, 0);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2347 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2348 break;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2349 case CODEC_ID_MPEG4:
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2350 put_bits(&s->pb, 16, 0);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2351 put_bits(&s->pb, 16, 0x1C3);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2352 stuffing_count -= 4;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2353 while(stuffing_count--){
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2354 put_bits(&s->pb, 8, 0xFF);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2355 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2356 break;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2357 default:
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2358 av_log(s->avctx, AV_LOG_ERROR, "vbv buffer overflow\n");
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2359 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2360 flush_put_bits(&s->pb);
1801
3f26dfb3eba4 replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents: 1799
diff changeset
2361 s->frame_bits = put_bits_count(&s->pb);
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2362 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2363
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2364 /* update mpeg1/2 vbv_delay for CBR */
1907
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
2365 if(s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate && s->out_format == FMT_MPEG1
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
2366 && 90000LL * (avctx->rc_buffer_size-1) <= s->avctx->rc_max_rate*0xFFFFLL){
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2367 int vbv_delay;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2368
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2369 assert(s->repeat_first_field==0);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2370
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2371 vbv_delay= lrintf(90000 * s->rc_context.buffer_index / s->avctx->rc_max_rate);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2372 assert(vbv_delay < 0xFFFF);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2373
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2374 s->vbv_delay_ptr[0] &= 0xF8;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2375 s->vbv_delay_ptr[0] |= vbv_delay>>13;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2376 s->vbv_delay_ptr[1] = vbv_delay>>5;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2377 s->vbv_delay_ptr[2] &= 0x07;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2378 s->vbv_delay_ptr[2] |= vbv_delay<<3;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2379 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2380 s->total_bits += s->frame_bits;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2381 avctx->frame_bits = s->frame_bits;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2382 }else{
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2383 assert((pbBufPtr(&s->pb) == s->pb.buf));
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2384 s->frame_bits=0;
1684
19e781619e3f stuffing to stay above min_bitrate
michael
parents: 1682
diff changeset
2385 }
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2386 assert((s->frame_bits&7)==0);
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
2387
1684
19e781619e3f stuffing to stay above min_bitrate
michael
parents: 1682
diff changeset
2388 return s->frame_bits/8;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2389 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2390
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
2391 #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
2392
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2393 static inline void gmc1_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2394 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2395 uint8_t **ref_picture)
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2396 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2397 uint8_t *ptr;
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
2398 int offset, src_x, src_y, linesize, uvlinesize;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2399 int motion_x, motion_y;
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2400 int emu=0;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2401
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2402 motion_x= s->sprite_offset[0][0];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2403 motion_y= s->sprite_offset[0][1];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2404 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2405 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2406 motion_x<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2407 motion_y<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2408 src_x = clip(src_x, -16, s->width);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2409 if (src_x == s->width)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2410 motion_x =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2411 src_y = clip(src_y, -16, s->height);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2412 if (src_y == s->height)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2413 motion_y =0;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2414
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2415 linesize = s->linesize;
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
2416 uvlinesize = s->uvlinesize;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2417
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2418 ptr = ref_picture[0] + (src_y * linesize) + src_x;
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2419
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2420 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
2421 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
2422 || (unsigned)src_y >= s->v_edge_pos - 17){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2423 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
2424 ptr= s->edge_emu_buffer;
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2425 }
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2426 }
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2427
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2428 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
2429 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
2430 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
2431 }else{
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2432 int dxy;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2433
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2434 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2435 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
2436 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
2437 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2438 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
2439 }
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2440 }
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2441
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2442 if(s->flags&CODEC_FLAG_GRAY) return;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2443
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2444 motion_x= s->sprite_offset[1][0];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2445 motion_y= s->sprite_offset[1][1];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2446 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2447 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2448 motion_x<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2449 motion_y<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2450 src_x = clip(src_x, -8, s->width>>1);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2451 if (src_x == s->width>>1)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2452 motion_x =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2453 src_y = clip(src_y, -8, s->height>>1);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2454 if (src_y == s->height>>1)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2455 motion_y =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2456
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2457 offset = (src_y * uvlinesize) + src_x;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2458 ptr = ref_picture[1] + offset;
1002
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
2459 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
2460 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
2461 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2462 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
2463 ptr= s->edge_emu_buffer;
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
2464 emu=1;
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
2465 }
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2466 }
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2467 s->dsp.gmc1(dest_cb, 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
2468
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2469 ptr = ref_picture[2] + offset;
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2470 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2471 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
2472 ptr= s->edge_emu_buffer;
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2473 }
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2474 s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding);
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2475
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2476 return;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2477 }
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2478
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2479 static inline void gmc_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2480 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2481 uint8_t **ref_picture)
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2482 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2483 uint8_t *ptr;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2484 int linesize, uvlinesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2485 const int a= s->sprite_warping_accuracy;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2486 int ox, oy;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2487
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2488 linesize = s->linesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2489 uvlinesize = s->uvlinesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2490
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2491 ptr = ref_picture[0];
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2492
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2493 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
2494 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
2495
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2496 s->dsp.gmc(dest_y, ptr, linesize, 16,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2497 ox,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2498 oy,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2499 s->sprite_delta[0][0], s->sprite_delta[0][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2500 s->sprite_delta[1][0], s->sprite_delta[1][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2501 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2502 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
2503 s->dsp.gmc(dest_y+8, ptr, linesize, 16,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2504 ox + s->sprite_delta[0][0]*8,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2505 oy + s->sprite_delta[1][0]*8,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2506 s->sprite_delta[0][0], s->sprite_delta[0][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2507 s->sprite_delta[1][0], s->sprite_delta[1][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2508 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2509 s->h_edge_pos, s->v_edge_pos);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2510
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2511 if(s->flags&CODEC_FLAG_GRAY) return;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2512
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2513 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
2514 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
2515
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2516 ptr = ref_picture[1];
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2517 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2518 ox,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2519 oy,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2520 s->sprite_delta[0][0], s->sprite_delta[0][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2521 s->sprite_delta[1][0], s->sprite_delta[1][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2522 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2523 s->h_edge_pos>>1, s->v_edge_pos>>1);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2524
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2525 ptr = ref_picture[2];
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2526 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2527 ox,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2528 oy,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2529 s->sprite_delta[0][0], s->sprite_delta[0][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2530 s->sprite_delta[1][0], s->sprite_delta[1][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2531 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2532 s->h_edge_pos>>1, s->v_edge_pos>>1);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2533 }
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2534
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2535 /**
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2536 * 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
2537 * @param buf destination buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2538 * @param src source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2539 * @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
2540 * @param block_w width of block
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2541 * @param block_h height of block
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2542 * @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
2543 * @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
2544 * @param w width of the source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2545 * @param h height of the source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2546 */
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2547 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
2548 int src_x, int src_y, int w, int h){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2549 int x, y;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2550 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
2551
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2552 if(src_y>= h){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2553 src+= (h-1-src_y)*linesize;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2554 src_y=h-1;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2555 }else if(src_y<=-block_h){
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2556 src+= (1-block_h-src_y)*linesize;
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2557 src_y=1-block_h;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2558 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2559 if(src_x>= w){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2560 src+= (w-1-src_x);
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2561 src_x=w-1;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2562 }else if(src_x<=-block_w){
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2563 src+= (1-block_w-src_x);
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2564 src_x=1-block_w;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2565 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2566
847
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
2567 start_y= FFMAX(0, -src_y);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
2568 start_x= FFMAX(0, -src_x);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
2569 end_y= FFMIN(block_h, h-src_y);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
2570 end_x= FFMIN(block_w, w-src_x);
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2571
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2572 // copy existing part
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2573 for(y=start_y; y<end_y; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2574 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2575 buf[x + y*linesize]= src[x + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2576 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2577 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2578
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2579 //top
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2580 for(y=0; y<start_y; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2581 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2582 buf[x + y*linesize]= buf[x + start_y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2583 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2584 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2585
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2586 //bottom
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2587 for(y=end_y; y<block_h; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2588 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2589 buf[x + y*linesize]= buf[x + (end_y-1)*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2590 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2591 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2592
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2593 for(y=0; y<block_h; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2594 //left
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2595 for(x=0; x<start_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2596 buf[x + y*linesize]= buf[start_x + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2597 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2598
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2599 //right
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2600 for(x=end_x; x<block_w; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2601 buf[x + y*linesize]= buf[end_x - 1 + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2602 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2603 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2604 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2605
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2606 static inline int hpel_motion(MpegEncContext *s,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2607 uint8_t *dest, uint8_t *src,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2608 int field_based, int field_select,
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2609 int src_x, int src_y,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2610 int width, int height, int stride,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2611 int h_edge_pos, int v_edge_pos,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2612 int w, int h, op_pixels_func *pix_op,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2613 int motion_x, int motion_y)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2614 {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2615 int dxy;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2616 int emu=0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2617
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2618 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2619 src_x += motion_x >> 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2620 src_y += motion_y >> 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2621
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2622 /* WARNING: do no forget half pels */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2623 src_x = clip(src_x, -16, width); //FIXME unneeded for emu?
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2624 if (src_x == width)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2625 dxy &= ~1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2626 src_y = clip(src_y, -16, height);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2627 if (src_y == height)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2628 dxy &= ~2;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2629 src += src_y * stride + src_x;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2630
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2631 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2632 if( (unsigned)src_x > h_edge_pos - (motion_x&1) - w
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2633 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2634 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2635 src_x, src_y<<field_based, h_edge_pos, s->v_edge_pos);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2636 src= s->edge_emu_buffer;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2637 emu=1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2638 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2639 }
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2640 if(field_select)
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2641 src += s->linesize;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2642 pix_op[dxy](dest, src, stride, h);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2643 return emu;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2644 }
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2645
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2646 static inline int hpel_motion_lowres(MpegEncContext *s,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2647 uint8_t *dest, uint8_t *src,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2648 int field_based, int field_select,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2649 int src_x, int src_y,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2650 int width, int height, int stride,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2651 int h_edge_pos, int v_edge_pos,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2652 int w, int h, h264_chroma_mc_func *pix_op,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2653 int motion_x, int motion_y)
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2654 {
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2655 const int lowres= s->avctx->lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2656 const int s_mask= (2<<lowres)-1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2657 int emu=0;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2658 int sx, sy;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2659
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2660 if(s->quarter_sample){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2661 motion_x/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2662 motion_y/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2663 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2664
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2665 sx= motion_x & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2666 sy= motion_y & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2667 src_x += motion_x >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2668 src_y += motion_y >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2669
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2670 src += src_y * stride + src_x;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2671
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2672 if( (unsigned)src_x > h_edge_pos - (!!sx) - w
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2673 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2674 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2675 src_x, src_y<<field_based, h_edge_pos, v_edge_pos);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2676 src= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2677 emu=1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2678 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2679
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2680 sx <<= 2 - lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2681 sy <<= 2 - lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2682 if(field_select)
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2683 src += s->linesize;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2684 pix_op[lowres](dest, src, stride, h, sx, sy);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2685 return emu;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2686 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2687
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2688 /* apply one mpeg motion vector to the three components */
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2689 static always_inline void mpeg_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2690 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2691 int field_based, int bottom_field, int field_select,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2692 uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2693 int motion_x, int motion_y, int h)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2694 {
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2695 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2696 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize;
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2697
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2698 #if 0
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2699 if(s->quarter_sample)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2700 {
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2701 motion_x>>=1;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2702 motion_y>>=1;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2703 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2704 #endif
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2705
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
2706 v_edge_pos = s->v_edge_pos >> field_based;
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2707 linesize = s->current_picture.linesize[0] << field_based;
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2708 uvlinesize = s->current_picture.linesize[1] << field_based;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2709
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2710 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2711 src_x = s->mb_x* 16 + (motion_x >> 1);
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2712 src_y =(s->mb_y<<(4-field_based)) + (motion_y >> 1);
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2713
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2714 if (s->out_format == FMT_H263) {
1916
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2715 if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2716 mx = (motion_x>>1)|(motion_x&1);
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2717 my = motion_y >>1;
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2718 uvdxy = ((my & 1) << 1) | (mx & 1);
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2719 uvsrc_x = s->mb_x* 8 + (mx >> 1);
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2720 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1);
1916
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2721 }else{
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2722 uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1);
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2723 uvsrc_x = src_x>>1;
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2724 uvsrc_y = src_y>>1;
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2725 }
2044
b6f2add2511e h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 2042
diff changeset
2726 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261
b6f2add2511e h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 2042
diff changeset
2727 mx = motion_x / 4;
b6f2add2511e h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 2042
diff changeset
2728 my = motion_y / 4;
b6f2add2511e h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 2042
diff changeset
2729 uvdxy = 0;
b6f2add2511e h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 2042
diff changeset
2730 uvsrc_x = s->mb_x*8 + mx;
b6f2add2511e h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 2042
diff changeset
2731 uvsrc_y = s->mb_y*8 + my;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2732 } else {
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2733 if(s->chroma_y_shift){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2734 mx = motion_x / 2;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2735 my = motion_y / 2;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2736 uvdxy = ((my & 1) << 1) | (mx & 1);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2737 uvsrc_x = s->mb_x* 8 + (mx >> 1);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2738 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2739 } else {
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2740 if(s->chroma_x_shift){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2741 //Chroma422
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2742 mx = motion_x / 2;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2743 uvdxy = ((motion_y & 1) << 1) | (mx & 1);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2744 uvsrc_x = s->mb_x* 8 + (mx >> 1);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2745 uvsrc_y = src_y;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2746 } else {
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2747 //Chroma444
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2748 uvdxy = dxy;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2749 uvsrc_x = src_x;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2750 uvsrc_y = src_y;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2751 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2752 }
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2753 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2754
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2755 ptr_y = ref_picture[0] + src_y * linesize + src_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2756 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2757 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2758
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2759 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2760 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2761 if(s->codec_id == CODEC_ID_MPEG2VIDEO ||
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2762 s->codec_id == CODEC_ID_MPEG1VIDEO){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2763 av_log(s->avctx,AV_LOG_DEBUG,"MPEG motion vector out of boundary\n");
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2764 return ;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2765 }
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2766 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2767 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2768 ptr_y = s->edge_emu_buffer;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2769 if(!(s->flags&CODEC_FLAG_GRAY)){
1874
michael
parents: 1863
diff changeset
2770 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2771 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based,
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2772 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2773 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based,
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2774 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2775 ptr_cb= uvbuf;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2776 ptr_cr= uvbuf+16;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2777 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2778 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2779
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2780 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2781 dest_y += s->linesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2782 dest_cb+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2783 dest_cr+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2784 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2785
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2786 if(field_select){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2787 ptr_y += s->linesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2788 ptr_cb+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2789 ptr_cr+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2790 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2791
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2792 pix_op[0][dxy](dest_y, ptr_y, linesize, h);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2793
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2794 if(!(s->flags&CODEC_FLAG_GRAY)){
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2795 pix_op[s->chroma_x_shift][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2796 pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift);
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2797 }
2291
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
2798 if(s->out_format == FMT_H261){
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
2799 ff_h261_loop_filter(s);
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
2800 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2801 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2802
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2803 /* apply one mpeg motion vector to the three components */
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2804 static always_inline void mpeg_motion_lowres(MpegEncContext *s,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2805 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2806 int field_based, int bottom_field, int field_select,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2807 uint8_t **ref_picture, h264_chroma_mc_func *pix_op,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2808 int motion_x, int motion_y, int h)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2809 {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2810 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2811 int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, uvlinesize, linesize, sx, sy, uvsx, uvsy;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2812 const int lowres= s->avctx->lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2813 const int block_s= 8>>lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2814 const int s_mask= (2<<lowres)-1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2815 const int h_edge_pos = s->h_edge_pos >> lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2816 const int v_edge_pos = s->v_edge_pos >> lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2817 linesize = s->current_picture.linesize[0] << field_based;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2818 uvlinesize = s->current_picture.linesize[1] << field_based;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2819
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2820 if(s->quarter_sample){ //FIXME obviously not perfect but qpel wont work in lowres anyway
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2821 motion_x/=2;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2822 motion_y/=2;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2823 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2824
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2825 if(field_based){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2826 motion_y += (bottom_field - field_select)*((1<<lowres)-1);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2827 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2828
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2829 sx= motion_x & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2830 sy= motion_y & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2831 src_x = s->mb_x*2*block_s + (motion_x >> (lowres+1));
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2832 src_y =(s->mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1));
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2833
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2834 if (s->out_format == FMT_H263) {
2265
c93da911905e lowres chroma fix
michael
parents: 2264
diff changeset
2835 uvsx = ((motion_x>>1) & s_mask) | (sx&1);
c93da911905e lowres chroma fix
michael
parents: 2264
diff changeset
2836 uvsy = ((motion_y>>1) & s_mask) | (sy&1);
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2837 uvsrc_x = src_x>>1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2838 uvsrc_y = src_y>>1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2839 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2840 mx = motion_x / 4;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2841 my = motion_y / 4;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2842 uvsx = (2*mx) & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2843 uvsy = (2*my) & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2844 uvsrc_x = s->mb_x*block_s + (mx >> lowres);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2845 uvsrc_y = s->mb_y*block_s + (my >> lowres);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2846 } else {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2847 mx = motion_x / 2;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2848 my = motion_y / 2;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2849 uvsx = mx & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2850 uvsy = my & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2851 uvsrc_x = s->mb_x*block_s + (mx >> (lowres+1));
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2852 uvsrc_y =(s->mb_y*block_s>>field_based) + (my >> (lowres+1));
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2853 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2854
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2855 ptr_y = ref_picture[0] + src_y * linesize + src_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2856 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2857 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2858
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2859 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2860 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2861 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2862 src_x, src_y<<field_based, h_edge_pos, v_edge_pos);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2863 ptr_y = s->edge_emu_buffer;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2864 if(!(s->flags&CODEC_FLAG_GRAY)){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2865 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2866 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2867 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2868 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2869 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2870 ptr_cb= uvbuf;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2871 ptr_cr= uvbuf+16;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2872 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2873 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2874
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2875 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2876 dest_y += s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2877 dest_cb+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2878 dest_cr+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2879 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2880
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2881 if(field_select){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2882 ptr_y += s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2883 ptr_cb+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2884 ptr_cr+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2885 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2886
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2887 sx <<= 2 - lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2888 sy <<= 2 - lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2889 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2890
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2891 if(!(s->flags&CODEC_FLAG_GRAY)){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2892 uvsx <<= 2 - lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2893 uvsy <<= 2 - lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2894 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2895 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2896 }
2291
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
2897 //FIXME h261 lowres loop filter
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2898 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2899
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2900 //FIXME move to dsputil, avg variant, 16x16 version
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2901 static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2902 int x;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2903 uint8_t * const top = src[1];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2904 uint8_t * const left = src[2];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2905 uint8_t * const mid = src[0];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2906 uint8_t * const right = src[3];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2907 uint8_t * const bottom= src[4];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2908 #define OBMC_FILTER(x, t, l, m, r, b)\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2909 dst[x]= (t*top[x] + l*left[x] + m*mid[x] + r*right[x] + b*bottom[x] + 4)>>3
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2910 #define OBMC_FILTER4(x, t, l, m, r, b)\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2911 OBMC_FILTER(x , t, l, m, r, b);\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2912 OBMC_FILTER(x+1 , t, l, m, r, b);\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2913 OBMC_FILTER(x +stride, t, l, m, r, b);\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2914 OBMC_FILTER(x+1+stride, t, l, m, r, b);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2915
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2916 x=0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2917 OBMC_FILTER (x , 2, 2, 4, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2918 OBMC_FILTER (x+1, 2, 1, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2919 OBMC_FILTER4(x+2, 2, 1, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2920 OBMC_FILTER4(x+4, 2, 0, 5, 1, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2921 OBMC_FILTER (x+6, 2, 0, 5, 1, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2922 OBMC_FILTER (x+7, 2, 0, 4, 2, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2923 x+= stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2924 OBMC_FILTER (x , 1, 2, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2925 OBMC_FILTER (x+1, 1, 2, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2926 OBMC_FILTER (x+6, 1, 0, 5, 2, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2927 OBMC_FILTER (x+7, 1, 0, 5, 2, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2928 x+= stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2929 OBMC_FILTER4(x , 1, 2, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2930 OBMC_FILTER4(x+2, 1, 1, 6, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2931 OBMC_FILTER4(x+4, 1, 0, 6, 1, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2932 OBMC_FILTER4(x+6, 1, 0, 5, 2, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2933 x+= 2*stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2934 OBMC_FILTER4(x , 0, 2, 5, 0, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2935 OBMC_FILTER4(x+2, 0, 1, 6, 0, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2936 OBMC_FILTER4(x+4, 0, 0, 6, 1, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2937 OBMC_FILTER4(x+6, 0, 0, 5, 2, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2938 x+= 2*stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2939 OBMC_FILTER (x , 0, 2, 5, 0, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2940 OBMC_FILTER (x+1, 0, 2, 5, 0, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2941 OBMC_FILTER4(x+2, 0, 1, 5, 0, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2942 OBMC_FILTER4(x+4, 0, 0, 5, 1, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2943 OBMC_FILTER (x+6, 0, 0, 5, 2, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2944 OBMC_FILTER (x+7, 0, 0, 5, 2, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2945 x+= stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2946 OBMC_FILTER (x , 0, 2, 4, 0, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2947 OBMC_FILTER (x+1, 0, 1, 5, 0, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2948 OBMC_FILTER (x+6, 0, 0, 5, 1, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2949 OBMC_FILTER (x+7, 0, 0, 4, 2, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2950 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2951
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2952 /* obmc for 1 8x8 luma block */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2953 static inline void obmc_motion(MpegEncContext *s,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2954 uint8_t *dest, uint8_t *src,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2955 int src_x, int src_y,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2956 op_pixels_func *pix_op,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2957 int16_t mv[5][2]/* mid top left right bottom*/)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2958 #define MID 0
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2959 {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2960 int i;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2961 uint8_t *ptr[5];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2962
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2963 assert(s->quarter_sample==0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2964
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2965 for(i=0; i<5; i++){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2966 if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2967 ptr[i]= ptr[MID];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2968 }else{
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2969 ptr[i]= s->obmc_scratchpad + 8*(i&1) + s->linesize*8*(i>>1);
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2970 hpel_motion(s, ptr[i], src, 0, 0,
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2971 src_x, src_y,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2972 s->width, s->height, s->linesize,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2973 s->h_edge_pos, s->v_edge_pos,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2974 8, 8, pix_op,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2975 mv[i][0], mv[i][1]);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2976 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2977 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2978
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2979 put_obmc(dest, ptr, s->linesize);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2980 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2981
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2982 static inline void qpel_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2983 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2984 int field_based, int bottom_field, int field_select,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2985 uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2986 qpel_mc_func (*qpix_op)[16],
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2987 int motion_x, int motion_y, int h)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2988 {
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2989 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2990 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, linesize, uvlinesize;
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2991
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2992 dxy = ((motion_y & 3) << 2) | (motion_x & 3);
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2993 src_x = s->mb_x * 16 + (motion_x >> 2);
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2994 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2995
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
2996 v_edge_pos = s->v_edge_pos >> field_based;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2997 linesize = s->linesize << field_based;
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2998 uvlinesize = s->uvlinesize << field_based;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2999
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3000 if(field_based){
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3001 mx= motion_x/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3002 my= motion_y>>1;
1048
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3003 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3004 static const int rtab[8]= {0,0,1,1,0,0,0,1};
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3005 mx= (motion_x>>1) + rtab[motion_x&7];
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3006 my= (motion_y>>1) + rtab[motion_y&7];
760
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 756
diff changeset
3007 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3008 mx= (motion_x>>1)|(motion_x&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3009 my= (motion_y>>1)|(motion_y&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3010 }else{
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3011 mx= motion_x/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3012 my= motion_y/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3013 }
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3014 mx= (mx>>1)|(mx&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3015 my= (my>>1)|(my&1);
1048
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3016
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3017 uvdxy= (mx&1) | ((my&1)<<1);
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3018 mx>>=1;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3019 my>>=1;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3020
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3021 uvsrc_x = s->mb_x * 8 + mx;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3022 uvsrc_y = s->mb_y * (8 >> field_based) + my;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3023
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3024 ptr_y = ref_picture[0] + src_y * linesize + src_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3025 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3026 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3027
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3028 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3029 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3030 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3031 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3032 ptr_y= s->edge_emu_buffer;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3033 if(!(s->flags&CODEC_FLAG_GRAY)){
1874
michael
parents: 1863
diff changeset
3034 uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize;
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3035 ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based,
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3036 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3037 ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based,
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3038 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3039 ptr_cb= uvbuf;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3040 ptr_cr= uvbuf + 16;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3041 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3042 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3043
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3044 if(!field_based)
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3045 qpix_op[0][dxy](dest_y, ptr_y, linesize);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3046 else{
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3047 if(bottom_field){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3048 dest_y += s->linesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3049 dest_cb+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3050 dest_cr+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3051 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3052
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3053 if(field_select){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3054 ptr_y += s->linesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3055 ptr_cb += s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3056 ptr_cr += s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3057 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3058 //damn interlaced mode
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3059 //FIXME boundary mirroring is not exactly correct here
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3060 qpix_op[1][dxy](dest_y , ptr_y , linesize);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3061 qpix_op[1][dxy](dest_y+8, ptr_y+8, linesize);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3062 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3063 if(!(s->flags&CODEC_FLAG_GRAY)){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3064 pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3065 pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3066 }
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3067 }
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3068
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3069 inline int ff_h263_round_chroma(int x){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3070 if (x >= 0)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3071 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1));
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3072 else {
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3073 x = -x;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3074 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1));
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3075 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3076 }
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3077
1225
michaelni
parents: 1218
diff changeset
3078 /**
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3079 * h263 chorma 4mv motion compensation.
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3080 */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3081 static inline void chroma_4mv_motion(MpegEncContext *s,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3082 uint8_t *dest_cb, uint8_t *dest_cr,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3083 uint8_t **ref_picture,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3084 op_pixels_func *pix_op,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3085 int mx, int my){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3086 int dxy, emu=0, src_x, src_y, offset;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3087 uint8_t *ptr;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3088
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3089 /* In case of 8X8, we construct a single chroma motion vector
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3090 with a special rounding */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3091 mx= ff_h263_round_chroma(mx);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3092 my= ff_h263_round_chroma(my);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3093
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3094 dxy = ((my & 1) << 1) | (mx & 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3095 mx >>= 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3096 my >>= 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3097
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3098 src_x = s->mb_x * 8 + mx;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3099 src_y = s->mb_y * 8 + my;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3100 src_x = clip(src_x, -8, s->width/2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3101 if (src_x == s->width/2)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3102 dxy &= ~1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3103 src_y = clip(src_y, -8, s->height/2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3104 if (src_y == s->height/2)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3105 dxy &= ~2;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3106
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3107 offset = (src_y * (s->uvlinesize)) + src_x;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3108 ptr = ref_picture[1] + offset;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3109 if(s->flags&CODEC_FLAG_EMU_EDGE){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3110 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3111 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3112 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3113 ptr= s->edge_emu_buffer;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3114 emu=1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3115 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3116 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3117 pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3118
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3119 ptr = ref_picture[2] + offset;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3120 if(emu){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3121 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3122 ptr= s->edge_emu_buffer;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3123 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3124 pix_op[dxy](dest_cr, ptr, s->uvlinesize, 8);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3125 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3126
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3127 static inline void chroma_4mv_motion_lowres(MpegEncContext *s,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3128 uint8_t *dest_cb, uint8_t *dest_cr,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3129 uint8_t **ref_picture,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3130 h264_chroma_mc_func *pix_op,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3131 int mx, int my){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3132 const int lowres= s->avctx->lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3133 const int block_s= 8>>lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3134 const int s_mask= (2<<lowres)-1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3135 const int h_edge_pos = s->h_edge_pos >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3136 const int v_edge_pos = s->v_edge_pos >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3137 int emu=0, src_x, src_y, offset, sx, sy;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3138 uint8_t *ptr;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3139
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3140 if(s->quarter_sample){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3141 mx/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3142 my/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3143 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3144
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3145 /* In case of 8X8, we construct a single chroma motion vector
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3146 with a special rounding */
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3147 mx= ff_h263_round_chroma(mx);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3148 my= ff_h263_round_chroma(my);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3149
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3150 sx= mx & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3151 sy= my & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3152 src_x = s->mb_x*block_s + (mx >> (lowres+1));
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3153 src_y = s->mb_y*block_s + (my >> (lowres+1));
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3154
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3155 offset = src_y * s->uvlinesize + src_x;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3156 ptr = ref_picture[1] + offset;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3157 if(s->flags&CODEC_FLAG_EMU_EDGE){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3158 if( (unsigned)src_x > h_edge_pos - (!!sx) - block_s
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3159 || (unsigned)src_y > v_edge_pos - (!!sy) - block_s){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3160 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3161 ptr= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3162 emu=1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3163 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3164 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3165 sx <<= 2 - lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3166 sy <<= 2 - lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3167 pix_op[lowres](dest_cb, ptr, s->uvlinesize, block_s, sx, sy);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3168
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3169 ptr = ref_picture[2] + offset;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3170 if(emu){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3171 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3172 ptr= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3173 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3174 pix_op[lowres](dest_cr, ptr, s->uvlinesize, block_s, sx, sy);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3175 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3176
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3177 /**
1225
michaelni
parents: 1218
diff changeset
3178 * motion compesation of a single macroblock
michaelni
parents: 1218
diff changeset
3179 * @param s context
michaelni
parents: 1218
diff changeset
3180 * @param dest_y luma destination pointer
michaelni
parents: 1218
diff changeset
3181 * @param dest_cb chroma cb/u destination pointer
michaelni
parents: 1218
diff changeset
3182 * @param dest_cr chroma cr/v destination pointer
michaelni
parents: 1218
diff changeset
3183 * @param dir direction (0->forward, 1->backward)
michaelni
parents: 1218
diff changeset
3184 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture
michaelni
parents: 1218
diff changeset
3185 * @param pic_op halfpel motion compensation function (average or put normally)
michaelni
parents: 1218
diff changeset
3186 * @param pic_op qpel motion compensation function (average or put normally)
michaelni
parents: 1218
diff changeset
3187 * the motion vectors are taken from s->mv and the MV type from s->mv_type
michaelni
parents: 1218
diff changeset
3188 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3189 static inline void MPV_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3190 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3191 int dir, uint8_t **ref_picture,
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3192 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16])
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3193 {
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3194 int dxy, mx, my, src_x, src_y, motion_x, motion_y;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3195 int mb_x, mb_y, i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3196 uint8_t *ptr, *dest;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3197
986e461dc072 Initial revision
glantau
parents:
diff changeset
3198 mb_x = s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3199 mb_y = s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3200
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
3201 if(s->obmc && s->pict_type != B_TYPE){
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3202 int16_t mv_cache[4][4][2];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3203 const int xy= s->mb_x + s->mb_y*s->mb_stride;
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3204 const int mot_stride= s->b8_stride;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3205 const int mot_xy= mb_x*2 + mb_y*2*mot_stride;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3206
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3207 assert(!s->mb_skiped);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3208
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3209 memcpy(mv_cache[1][1], s->current_picture.motion_val[0][mot_xy ], sizeof(int16_t)*4);
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3210 memcpy(mv_cache[2][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4);
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3211 memcpy(mv_cache[3][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3212
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3213 if(mb_y==0 || IS_INTRA(s->current_picture.mb_type[xy-s->mb_stride])){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3214 memcpy(mv_cache[0][1], mv_cache[1][1], sizeof(int16_t)*4);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3215 }else{
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3216 memcpy(mv_cache[0][1], s->current_picture.motion_val[0][mot_xy-mot_stride], sizeof(int16_t)*4);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3217 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3218
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3219 if(mb_x==0 || IS_INTRA(s->current_picture.mb_type[xy-1])){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3220 *(int32_t*)mv_cache[1][0]= *(int32_t*)mv_cache[1][1];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3221 *(int32_t*)mv_cache[2][0]= *(int32_t*)mv_cache[2][1];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3222 }else{
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3223 *(int32_t*)mv_cache[1][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3224 *(int32_t*)mv_cache[2][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1+mot_stride];
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3225 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3226
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3227 if(mb_x+1>=s->mb_width || IS_INTRA(s->current_picture.mb_type[xy+1])){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3228 *(int32_t*)mv_cache[1][3]= *(int32_t*)mv_cache[1][2];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3229 *(int32_t*)mv_cache[2][3]= *(int32_t*)mv_cache[2][2];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3230 }else{
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3231 *(int32_t*)mv_cache[1][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3232 *(int32_t*)mv_cache[2][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2+mot_stride];
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3233 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3234
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3235 mx = 0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3236 my = 0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3237 for(i=0;i<4;i++) {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3238 const int x= (i&1)+1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3239 const int y= (i>>1)+1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3240 int16_t mv[5][2]= {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3241 {mv_cache[y][x ][0], mv_cache[y][x ][1]},
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3242 {mv_cache[y-1][x][0], mv_cache[y-1][x][1]},
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3243 {mv_cache[y][x-1][0], mv_cache[y][x-1][1]},
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3244 {mv_cache[y][x+1][0], mv_cache[y][x+1][1]},
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3245 {mv_cache[y+1][x][0], mv_cache[y+1][x][1]}};
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3246 //FIXME cleanup
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3247 obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3248 ref_picture[0],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3249 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3250 pix_op[1],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3251 mv);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3252
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3253 mx += mv[0][0];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3254 my += mv[0][1];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3255 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3256 if(!(s->flags&CODEC_FLAG_GRAY))
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3257 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3258
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3259 return;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3260 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3261
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3262 switch(s->mv_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3263 case MV_TYPE_16X16:
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3264 if(s->mcsel){
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
3265 if(s->real_sprite_warping_points==1){
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3266 gmc1_motion(s, dest_y, dest_cb, dest_cr,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3267 ref_picture);
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
3268 }else{
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3269 gmc_motion(s, dest_y, dest_cb, dest_cr,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3270 ref_picture);
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
3271 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3272 }else if(s->quarter_sample){
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3273 qpel_motion(s, dest_y, dest_cb, dest_cr,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3274 0, 0, 0,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3275 ref_picture, pix_op, qpix_op,
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3276 s->mv[dir][0][0], s->mv[dir][0][1], 16);
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3277 }else if(s->mspel){
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3278 ff_mspel_motion(s, dest_y, dest_cb, dest_cr,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3279 ref_picture, pix_op,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3280 s->mv[dir][0][0], s->mv[dir][0][1], 16);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3281 }else
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3282 {
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3283 mpeg_motion(s, dest_y, dest_cb, dest_cr,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3284 0, 0, 0,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3285 ref_picture, pix_op,
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3286 s->mv[dir][0][0], s->mv[dir][0][1], 16);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3287 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3288 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3289 case MV_TYPE_8X8:
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3290 mx = 0;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3291 my = 0;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3292 if(s->quarter_sample){
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3293 for(i=0;i<4;i++) {
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3294 motion_x = s->mv[dir][i][0];
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3295 motion_y = s->mv[dir][i][1];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3296
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3297 dxy = ((motion_y & 3) << 2) | (motion_x & 3);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3298 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3299 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3300
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3301 /* WARNING: do no forget half pels */
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3302 src_x = clip(src_x, -16, s->width);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3303 if (src_x == s->width)
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3304 dxy &= ~3;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3305 src_y = clip(src_y, -16, s->height);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3306 if (src_y == s->height)
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3307 dxy &= ~12;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3308
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3309 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3310 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
3311 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
3312 || (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
3313 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
3314 ptr= s->edge_emu_buffer;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3315 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3316 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3317 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3318 qpix_op[1][dxy](dest, ptr, s->linesize);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3319
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3320 mx += s->mv[dir][i][0]/2;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3321 my += s->mv[dir][i][1]/2;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3322 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3323 }else{
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3324 for(i=0;i<4;i++) {
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3325 hpel_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3326 ref_picture[0], 0, 0,
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3327 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3328 s->width, s->height, s->linesize,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3329 s->h_edge_pos, s->v_edge_pos,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3330 8, 8, pix_op[1],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3331 s->mv[dir][i][0], s->mv[dir][i][1]);
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3332
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3333 mx += s->mv[dir][i][0];
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3334 my += s->mv[dir][i][1];
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
3335 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3336 }
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3337
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3338 if(!(s->flags&CODEC_FLAG_GRAY))
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3339 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3340 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3341 case MV_TYPE_FIELD:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3342 if (s->picture_structure == PICT_FRAME) {
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3343 if(s->quarter_sample){
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3344 for(i=0; i<2; i++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3345 qpel_motion(s, dest_y, dest_cb, dest_cr,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3346 1, i, s->field_select[dir][i],
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3347 ref_picture, pix_op, qpix_op,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3348 s->mv[dir][i][0], s->mv[dir][i][1], 8);
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3349 }
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3350 }else{
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3351 /* top field */
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3352 mpeg_motion(s, dest_y, dest_cb, dest_cr,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3353 1, 0, s->field_select[dir][0],
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3354 ref_picture, pix_op,
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3355 s->mv[dir][0][0], s->mv[dir][0][1], 8);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3356 /* bottom field */
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3357 mpeg_motion(s, dest_y, dest_cb, dest_cr,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3358 1, 1, s->field_select[dir][1],
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3359 ref_picture, pix_op,
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3360 s->mv[dir][1][0], s->mv[dir][1][1], 8);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3361 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3362 } else {
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3363 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3364 ref_picture= s->current_picture_ptr->data;
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
3365 }
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
3366
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3367 mpeg_motion(s, dest_y, dest_cb, dest_cr,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3368 0, 0, s->field_select[dir][0],
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3369 ref_picture, pix_op,
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
3370 s->mv[dir][0][0], s->mv[dir][0][1], 16);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3371 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3372 break;
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3373 case MV_TYPE_16X8:
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3374 for(i=0; i<2; i++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3375 uint8_t ** ref2picture;
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3376
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3377 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){
1339
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
3378 ref2picture= ref_picture;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
3379 }else{
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3380 ref2picture= s->current_picture_ptr->data;
1339
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
3381 }
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
3382
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3383 mpeg_motion(s, dest_y, dest_cb, dest_cr,
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3384 0, 0, s->field_select[dir][i],
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3385 ref2picture, pix_op,
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3386 s->mv[dir][i][0], s->mv[dir][i][1] + 16*i, 8);
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3387
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3388 dest_y += 16*s->linesize;
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3389 dest_cb+= (16>>s->chroma_y_shift)*s->uvlinesize;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3390 dest_cr+= (16>>s->chroma_y_shift)*s->uvlinesize;
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3391 }
1339
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
3392 break;
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3393 case MV_TYPE_DMV:
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3394 if(s->picture_structure == PICT_FRAME){
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3395 for(i=0; i<2; i++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3396 int j;
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3397 for(j=0; j<2; j++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3398 mpeg_motion(s, dest_y, dest_cb, dest_cr,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3399 1, j, j^i,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3400 ref_picture, pix_op,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3401 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], 8);
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3402 }
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3403 pix_op = s->dsp.avg_pixels_tab;
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3404 }
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3405 }else{
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3406 for(i=0; i<2; i++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3407 mpeg_motion(s, dest_y, dest_cb, dest_cr,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3408 0, 0, s->picture_structure != i+1,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3409 ref_picture, pix_op,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3410 s->mv[dir][2*i][0],s->mv[dir][2*i][1],16);
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3411
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3412 // after put we make avg of the same block
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3413 pix_op=s->dsp.avg_pixels_tab;
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3414
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3415 //opposite parity is always in the same frame if this is second field
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3416 if(!s->first_field){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3417 ref_picture = s->current_picture_ptr->data;
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3418 }
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3419 }
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3420 }
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3421 break;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3422 default: assert(0);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3423 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3424 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3425
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3426 /**
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3427 * motion compesation of a single macroblock
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3428 * @param s context
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3429 * @param dest_y luma destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3430 * @param dest_cb chroma cb/u destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3431 * @param dest_cr chroma cr/v destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3432 * @param dir direction (0->forward, 1->backward)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3433 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3434 * @param pic_op halfpel motion compensation function (average or put normally)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3435 * the motion vectors are taken from s->mv and the MV type from s->mv_type
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3436 */
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3437 static inline void MPV_motion_lowres(MpegEncContext *s,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3438 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3439 int dir, uint8_t **ref_picture,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3440 h264_chroma_mc_func *pix_op)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3441 {
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3442 int mx, my;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3443 int mb_x, mb_y, i;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3444 const int lowres= s->avctx->lowres;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3445 const int block_s= 8>>lowres;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3446
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3447 mb_x = s->mb_x;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3448 mb_y = s->mb_y;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3449
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3450 switch(s->mv_type) {
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3451 case MV_TYPE_16X16:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3452 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3453 0, 0, 0,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3454 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3455 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3456 break;
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3457 case MV_TYPE_8X8:
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3458 mx = 0;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3459 my = 0;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3460 for(i=0;i<4;i++) {
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3461 hpel_motion_lowres(s, dest_y + ((i & 1) + (i >> 1) * s->linesize)*block_s,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3462 ref_picture[0], 0, 0,
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3463 (2*mb_x + (i & 1))*block_s, (2*mb_y + (i >>1))*block_s,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3464 s->width, s->height, s->linesize,
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3465 s->h_edge_pos >> lowres, s->v_edge_pos >> lowres,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3466 block_s, block_s, pix_op,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3467 s->mv[dir][i][0], s->mv[dir][i][1]);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3468
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3469 mx += s->mv[dir][i][0];
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3470 my += s->mv[dir][i][1];
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3471 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3472
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3473 if(!(s->flags&CODEC_FLAG_GRAY))
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3474 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3475 break;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3476 case MV_TYPE_FIELD:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3477 if (s->picture_structure == PICT_FRAME) {
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3478 /* top field */
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3479 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3480 1, 0, s->field_select[dir][0],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3481 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3482 s->mv[dir][0][0], s->mv[dir][0][1], block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3483 /* bottom field */
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3484 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3485 1, 1, s->field_select[dir][1],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3486 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3487 s->mv[dir][1][0], s->mv[dir][1][1], block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3488 } else {
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3489 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3490 ref_picture= s->current_picture_ptr->data;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3491 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3492
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3493 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3494 0, 0, s->field_select[dir][0],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3495 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3496 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3497 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3498 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3499 case MV_TYPE_16X8:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3500 for(i=0; i<2; i++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3501 uint8_t ** ref2picture;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3502
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3503 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3504 ref2picture= ref_picture;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3505 }else{
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3506 ref2picture= s->current_picture_ptr->data;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3507 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3508
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3509 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3510 0, 0, s->field_select[dir][i],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3511 ref2picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3512 s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3513
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3514 dest_y += 2*block_s*s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3515 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3516 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3517 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3518 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3519 case MV_TYPE_DMV:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3520 if(s->picture_structure == PICT_FRAME){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3521 for(i=0; i<2; i++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3522 int j;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3523 for(j=0; j<2; j++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3524 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3525 1, j, j^i,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3526 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3527 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3528 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3529 pix_op = s->dsp.avg_h264_chroma_pixels_tab;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3530 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3531 }else{
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3532 for(i=0; i<2; i++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3533 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3534 0, 0, s->picture_structure != i+1,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3535 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3536 s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3537
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3538 // after put we make avg of the same block
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3539 pix_op = s->dsp.avg_h264_chroma_pixels_tab;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3540
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3541 //opposite parity is always in the same frame if this is second field
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3542 if(!s->first_field){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3543 ref_picture = s->current_picture_ptr->data;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3544 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3545 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3546 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3547 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3548 default: assert(0);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3549 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3550 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3551
986e461dc072 Initial revision
glantau
parents:
diff changeset
3552 /* put block[] to dest[] */
986e461dc072 Initial revision
glantau
parents:
diff changeset
3553 static inline void put_dct(MpegEncContext *s,
1651
ccf7c96a630f h263 modified quantization fix
michael
parents: 1644
diff changeset
3554 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3555 {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
3556 s->dct_unquantize_intra(s, block, i, qscale);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
3557 s->dsp.idct_put (dest, line_size, block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3558 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3559
986e461dc072 Initial revision
glantau
parents:
diff changeset
3560 /* add block[] to dest[] */
986e461dc072 Initial revision
glantau
parents:
diff changeset
3561 static inline void add_dct(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3562 DCTELEM *block, int i, uint8_t *dest, int line_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3563 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3564 if (s->block_last_index[i] >= 0) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
3565 s->dsp.idct_add (dest, line_size, block);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3566 }
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3567 }
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3568
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3569 static inline void add_dequant_dct(MpegEncContext *s,
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
3570 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale)
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3571 {
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3572 if (s->block_last_index[i] >= 0) {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
3573 s->dct_unquantize_inter(s, block, i, qscale);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3574
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
3575 s->dsp.idct_add (dest, line_size, block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3576 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3577 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3578
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3579 /**
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3580 * cleans dc, ac, coded_block for the current non intra MB
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3581 */
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3582 void ff_clean_intra_table_entries(MpegEncContext *s)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3583 {
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3584 int wrap = s->b8_stride;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3585 int xy = s->block_index[0];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3586
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3587 s->dc_val[0][xy ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3588 s->dc_val[0][xy + 1 ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3589 s->dc_val[0][xy + wrap] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3590 s->dc_val[0][xy + 1 + wrap] = 1024;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3591 /* ac pred */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3592 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3593 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t));
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3594 if (s->msmpeg4_version>=3) {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3595 s->coded_block[xy ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3596 s->coded_block[xy + 1 ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3597 s->coded_block[xy + wrap] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3598 s->coded_block[xy + 1 + wrap] = 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3599 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3600 /* chroma */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3601 wrap = s->mb_stride;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3602 xy = s->mb_x + s->mb_y * wrap;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3603 s->dc_val[1][xy] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3604 s->dc_val[2][xy] = 1024;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3605 /* ac pred */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3606 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3607 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t));
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3608
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3609 s->mbintra_table[xy]= 0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3610 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3611
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3612 /* generic function called after a macroblock has been parsed by the
986e461dc072 Initial revision
glantau
parents:
diff changeset
3613 decoder or after it has been encoded by the encoder.
986e461dc072 Initial revision
glantau
parents:
diff changeset
3614
986e461dc072 Initial revision
glantau
parents:
diff changeset
3615 Important variables used:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3616 s->mb_intra : true if intra macroblock
986e461dc072 Initial revision
glantau
parents:
diff changeset
3617 s->mv_dir : motion vector direction
986e461dc072 Initial revision
glantau
parents:
diff changeset
3618 s->mv_type : motion vector type
986e461dc072 Initial revision
glantau
parents:
diff changeset
3619 s->mv : motion vector
986e461dc072 Initial revision
glantau
parents:
diff changeset
3620 s->interlaced_dct : true if interlaced dct used (mpeg2)
986e461dc072 Initial revision
glantau
parents:
diff changeset
3621 */
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3622 static always_inline void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], int lowres_flag)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3623 {
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
3624 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
3625 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3626 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3627 if(s->avctx->xvmc_acceleration){
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
3628 XVMC_decode_mb(s);//xvmc uses pblocks
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3629 return;
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3630 }
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3631 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3632
986e461dc072 Initial revision
glantau
parents:
diff changeset
3633 mb_x = s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3634 mb_y = s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3635
1833
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3636 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) {
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3637 /* save DCT coefficients */
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3638 int i,j;
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3639 DCTELEM *dct = &s->current_picture.dct_coeff[mb_xy*64*6];
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3640 for(i=0; i<6; i++)
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3641 for(j=0; j<64; j++)
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3642 *dct++ = block[i][s->dsp.idct_permutation[j]];
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3643 }
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3644
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3645 s->current_picture.qscale_table[mb_xy]= s->qscale;
108
1e4a4af694d1 exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents: 79
diff changeset
3646
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3647 /* update DC predictors for P macroblocks */
986e461dc072 Initial revision
glantau
parents:
diff changeset
3648 if (!s->mb_intra) {
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
3649 if (s->h263_pred || s->h263_aic) {
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3650 if(s->mbintra_table[mb_xy])
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3651 ff_clean_intra_table_entries(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3652 } else {
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3653 s->last_dc[0] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3654 s->last_dc[1] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3655 s->last_dc[2] = 128 << s->intra_dc_precision;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3656 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3657 }
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
3658 else if (s->h263_pred || s->h263_aic)
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3659 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
3660
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3661 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
3662 uint8_t *dest_y, *dest_cb, *dest_cr;
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3663 int dct_linesize, dct_offset;
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3664 op_pixels_func (*op_pix)[4];
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3665 qpel_mc_func (*op_qpix)[16];
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
3666 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
3667 const int uvlinesize= s->current_picture.linesize[1];
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3668 const int readable= s->pict_type != B_TYPE || s->encoding || s->avctx->draw_horiz_band || lowres_flag;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3669 const int block_size= lowres_flag ? 8>>s->avctx->lowres : 8;
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
3670
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3671 /* avoid copy if macroblock skipped in last frame too */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3672 /* skip only during decoding as we might trash the buffers during encoding a bit */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3673 if(!s->encoding){
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3674 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy];
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3675 const int age= s->current_picture.age;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3676
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3677 assert(age);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3678
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
3679 if (s->mb_skiped) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3680 s->mb_skiped= 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3681 assert(s->pict_type!=I_TYPE);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3682
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
3683 (*mbskip_ptr) ++; /* indicate that this time we skiped it */
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
3684 if(*mbskip_ptr >99) *mbskip_ptr= 99;
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
3685
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3686 /* 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
3687 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
3688 return;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3689 }
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
3690 } 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
3691 (*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
3692 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
3693 } else{
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
3694 *mbskip_ptr = 0; /* not skipped */
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
3695 }
717
6cba3b6196f0 optimization
michaelni
parents: 711
diff changeset
3696 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3697
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3698 dct_linesize = linesize << s->interlaced_dct;
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3699 dct_offset =(s->interlaced_dct)? linesize : linesize*block_size;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3700
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3701 if(readable){
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3702 dest_y= s->dest[0];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3703 dest_cb= s->dest[1];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3704 dest_cr= s->dest[2];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3705 }else{
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
3706 dest_y = s->b_scratchpad;
1834
41c324b09fcc 100l (field picture decoding fix)
michael
parents: 1833
diff changeset
3707 dest_cb= s->b_scratchpad+16*linesize;
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3708 dest_cr= s->b_scratchpad+32*linesize;
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3709 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3710
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3711 if (!s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3712 /* motion handling */
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3713 /* decoding or more than one mb_type (MC was allready done otherwise) */
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3714 if(!s->encoding){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3715 if(lowres_flag){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3716 h264_chroma_mc_func *op_pix = s->dsp.put_h264_chroma_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3717
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3718 if (s->mv_dir & MV_DIR_FORWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3719 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3720 op_pix = s->dsp.avg_h264_chroma_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3721 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3722 if (s->mv_dir & MV_DIR_BACKWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3723 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3724 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3725 }else{
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3726 if ((!s->no_rounding) || s->pict_type==B_TYPE){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3727 op_pix = s->dsp.put_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3728 op_qpix= s->dsp.put_qpel_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3729 }else{
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3730 op_pix = s->dsp.put_no_rnd_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3731 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3732 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3733 if (s->mv_dir & MV_DIR_FORWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3734 MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3735 op_pix = s->dsp.avg_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3736 op_qpix= s->dsp.avg_qpel_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3737 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3738 if (s->mv_dir & MV_DIR_BACKWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3739 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3740 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3741 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3742 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3743
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3744 /* skip dequant / idct if we are really late ;) */
814
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 813
diff changeset
3745 if(s->hurry_up>1) return;
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3746
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3747 /* add dct residue */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3748 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
3749 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3750 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3751 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3752 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3753 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3754
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
3755 if(!(s->flags&CODEC_FLAG_GRAY)){
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
3756 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
3757 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
3758 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3759 } else if(s->codec_id != CODEC_ID_WMV2){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3760 add_dct(s, block[0], 0, dest_y , dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3761 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3762 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3763 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3764
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
3765 if(!(s->flags&CODEC_FLAG_GRAY)){
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3766 if(s->chroma_y_shift){//Chroma420
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3767 add_dct(s, block[4], 4, dest_cb, uvlinesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3768 add_dct(s, block[5], 5, dest_cr, uvlinesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3769 }else{
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3770 //chroma422
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3771 dct_linesize = uvlinesize << s->interlaced_dct;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3772 dct_offset =(s->interlaced_dct)? uvlinesize : uvlinesize*8;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3773
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3774 add_dct(s, block[4], 4, dest_cb, dct_linesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3775 add_dct(s, block[5], 5, dest_cr, dct_linesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3776 add_dct(s, block[6], 6, dest_cb+dct_offset, dct_linesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3777 add_dct(s, block[7], 7, dest_cr+dct_offset, dct_linesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3778 if(!s->chroma_x_shift){//Chroma444
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3779 add_dct(s, block[8], 8, dest_cb+8, dct_linesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3780 add_dct(s, block[9], 9, dest_cr+8, dct_linesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3781 add_dct(s, block[10], 10, dest_cb+8+dct_offset, dct_linesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3782 add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3783 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3784 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3785 }//fi gray
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3786 }
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3787 else{
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3788 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3789 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3790 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3791 /* dct only in intra block */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3792 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3793 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3794 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3795 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3796 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3797
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3798 if(!(s->flags&CODEC_FLAG_GRAY)){
1651
ccf7c96a630f h263 modified quantization fix
michael
parents: 1644
diff changeset
3799 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
ccf7c96a630f h263 modified quantization fix
michael
parents: 1644
diff changeset
3800 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3801 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3802 }else{
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3803 s->dsp.idct_put(dest_y , dct_linesize, block[0]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3804 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3805 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3806 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3807
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3808 if(!(s->flags&CODEC_FLAG_GRAY)){
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3809 if(s->chroma_y_shift){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3810 s->dsp.idct_put(dest_cb, uvlinesize, block[4]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3811 s->dsp.idct_put(dest_cr, uvlinesize, block[5]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3812 }else{
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3813
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3814 dct_linesize = uvlinesize << s->interlaced_dct;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3815 dct_offset =(s->interlaced_dct)? uvlinesize : uvlinesize*8;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3816
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3817 s->dsp.idct_put(dest_cb, dct_linesize, block[4]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3818 s->dsp.idct_put(dest_cr, dct_linesize, block[5]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3819 s->dsp.idct_put(dest_cb + dct_offset, dct_linesize, block[6]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3820 s->dsp.idct_put(dest_cr + dct_offset, dct_linesize, block[7]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3821 if(!s->chroma_x_shift){//Chroma444
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3822 s->dsp.idct_put(dest_cb + 8, dct_linesize, block[8]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3823 s->dsp.idct_put(dest_cr + 8, dct_linesize, block[9]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3824 s->dsp.idct_put(dest_cb + 8 + dct_offset, dct_linesize, block[10]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3825 s->dsp.idct_put(dest_cr + 8 + dct_offset, dct_linesize, block[11]);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3826 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3827 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3828 }//gray
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
3829 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3830 }
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3831 if(!readable){
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3832 s->dsp.put_pixels_tab[0][0](s->dest[0], dest_y , linesize,16);
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3833 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift);
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3834 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift);
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3835 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3836 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3837 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3838
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3839 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3840 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3841 else MPV_decode_mb_internal(s, block, 0);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3842 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3843
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
3844 #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
3845
605
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
3846 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold)
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3847 {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3848 static const char tab[64]=
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3849 {3,2,2,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3850 1,1,1,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3851 1,1,1,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3852 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3853 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3854 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3855 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3856 0,0,0,0,0,0,0,0};
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3857 int score=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3858 int run=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3859 int i;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3860 DCTELEM *block= s->block[n];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3861 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
3862 int skip_dc;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3863
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
3864 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
3865 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
3866 threshold= -threshold;
605
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
3867 }else
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
3868 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
3869
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3870 /* are all which we could set to zero are allready zero? */
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3871 if(last_index<=skip_dc - 1) return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3872
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3873 for(i=0; i<=last_index; i++){
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3874 const int j = s->intra_scantable.permutated[i];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3875 const int level = ABS(block[j]);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3876 if(level==1){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3877 if(skip_dc && i==0) continue;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3878 score+= tab[run];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3879 run=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3880 }else if(level>1){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3881 return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3882 }else{
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3883 run++;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3884 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3885 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3886 if(score >= threshold) return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3887 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
3888 const int j = s->intra_scantable.permutated[i];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3889 block[j]=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3890 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3891 if(block[0]) s->block_last_index[n]= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3892 else s->block_last_index[n]= -1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3893 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3894
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3895 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
3896 {
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3897 int i;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3898 const int maxlevel= s->max_qcoeff;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3899 const int minlevel= s->min_qcoeff;
1722
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3900 int overflow=0;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3901
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3902 if(s->mb_intra){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3903 i=1; //skip clipping of intra dc
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3904 }else
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3905 i=0;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3906
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3907 for(;i<=last_index; i++){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3908 const int j= s->intra_scantable.permutated[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3909 int level = block[j];
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3910
1722
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3911 if (level>maxlevel){
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3912 level=maxlevel;
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3913 overflow++;
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3914 }else if(level<minlevel){
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3915 level=minlevel;
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3916 overflow++;
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3917 }
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3918
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3919 block[j]= level;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3920 }
1722
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3921
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3922 if(overflow && s->avctx->mb_decision == FF_MB_DECISION_SIMPLE)
7e040c2a86e4 warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents: 1719
diff changeset
3923 av_log(s->avctx, AV_LOG_INFO, "warning, cliping %d dct coefficents to %d..%d\n", overflow, minlevel, maxlevel);
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3924 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3925
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
3926 #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
3927
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
3928 /**
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
3929 *
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
3930 * @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
3931 */
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
3932 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3933 if (s->avctx->draw_horiz_band) {
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3934 AVFrame *src;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3935 int offset[4];
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3936
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3937 if(s->picture_structure != PICT_FRAME){
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3938 h <<= 1;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3939 y <<= 1;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3940 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
3941 }
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3942
2266
514949de5d15 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents: 2265
diff changeset
3943 h= FFMIN(h, s->avctx->height - y);
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
3944
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3945 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
3946 src= (AVFrame*)s->current_picture_ptr;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3947 else if(s->last_picture_ptr)
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3948 src= (AVFrame*)s->last_picture_ptr;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3949 else
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3950 return;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3951
1369
8a150a66d2d9 svq3 b frame slices fix
michaelni
parents: 1368
diff changeset
3952 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
3953 offset[0]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3954 offset[1]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3955 offset[2]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3956 offset[3]= 0;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3957 }else{
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3958 offset[0]= y * s->linesize;;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3959 offset[1]=
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3960 offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3961 offset[3]= 0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3962 }
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3963
813
dfaa1c45bd27 cleanup
michaelni
parents: 809
diff changeset
3964 emms_c();
dfaa1c45bd27 cleanup
michaelni
parents: 809
diff changeset
3965
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3966 s->avctx->draw_horiz_band(s->avctx, src, offset,
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
3967 y, s->picture_structure, h);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3968 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3969 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3970
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3971 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3972 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
3973 const int uvlinesize= s->current_picture.linesize[1];
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3974 const int mb_size= 4 - s->avctx->lowres;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3975
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3976 s->block_index[0]= s->b8_stride*(s->mb_y*2 ) - 2 + s->mb_x*2;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3977 s->block_index[1]= s->b8_stride*(s->mb_y*2 ) - 1 + s->mb_x*2;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3978 s->block_index[2]= s->b8_stride*(s->mb_y*2 + 1) - 2 + s->mb_x*2;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3979 s->block_index[3]= s->b8_stride*(s->mb_y*2 + 1) - 1 + s->mb_x*2;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3980 s->block_index[4]= s->mb_stride*(s->mb_y + 1) + s->b8_stride*s->mb_height*2 + s->mb_x - 1;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3981 s->block_index[5]= s->mb_stride*(s->mb_y + s->mb_height + 2) + s->b8_stride*s->mb_height*2 + s->mb_x - 1;
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3982 //block_index is not used by mpeg2, so it is not affected by chroma_format
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3983
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3984 s->dest[0] = s->current_picture.data[0] + ((s->mb_x - 1) << mb_size);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3985 s->dest[1] = s->current_picture.data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift));
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3986 s->dest[2] = s->current_picture.data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift));
2168
f3f5dabef677 minor optimization
michael
parents: 2165
diff changeset
3987
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3988 if(!(s->pict_type==B_TYPE && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME))
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3989 {
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3990 s->dest[0] += s->mb_y * linesize << mb_size;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3991 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3992 s->dest[2] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift);
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3993 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3994 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3995
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
3996 #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
3997
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
3998 static void get_vissual_weight(int16_t *weight, uint8_t *ptr, int stride){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
3999 int x, y;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4000 //FIXME optimize
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4001 for(y=0; y<8; y++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4002 for(x=0; x<8; x++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4003 int x2, y2;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4004 int sum=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4005 int sqr=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4006 int count=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4007
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4008 for(y2= FFMAX(y-1, 0); y2 < FFMIN(8, y+2); y2++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4009 for(x2= FFMAX(x-1, 0); x2 < FFMIN(8, x+2); x2++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4010 int v= ptr[x2 + y2*stride];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4011 sum += v;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4012 sqr += v*v;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4013 count++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4014 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4015 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4016 weight[x + 8*y]= (36*ff_sqrt(count*sqr - sum*sum)) / count;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4017 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4018 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4019 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4020
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4021 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
4022 {
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4023 int16_t weight[6][64];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4024 DCTELEM orig[6][64];
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4025 const int mb_x= s->mb_x;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4026 const int mb_y= s->mb_y;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4027 int i;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4028 int skip_dct[6];
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4029 int dct_offset = s->linesize*8; //default for progressive frames
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4030 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
34466835920f simplify
michael
parents: 1777
diff changeset
4031 int wrap_y, wrap_c;
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4032
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4033 for(i=0; i<6; i++) skip_dct[i]=0;
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
4034
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
4035 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
4036 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
4037 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
4038
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
4039 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
4040 update_qscale(s);
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4041
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4042 if(!(s->flags&CODEC_FLAG_QP_RD)){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4043 s->dquant= s->qscale - last_qp;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4044
1805
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4045 if(s->out_format==FMT_H263){
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4046 s->dquant= clip(s->dquant, -2, 2); //FIXME RD
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4047
1805
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4048 if(s->codec_id==CODEC_ID_MPEG4){
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4049 if(!s->mb_intra){
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4050 if(s->pict_type == B_TYPE){
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4051 if(s->dquant&1)
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4052 s->dquant= (s->dquant/2)*2;
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4053 if(s->mv_dir&MV_DIRECT)
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4054 s->dquant= 0;
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4055 }
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4056 if(s->mv_type==MV_TYPE_8X8)
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4057 s->dquant=0;
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4058 }
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4059 }
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
4060 }
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
4061 }
1652
834922115010 cleanup
michael
parents: 1651
diff changeset
4062 ff_set_qscale(s, last_qp + s->dquant);
2054
06d6a6bade18 qscale + qprd fix
michael
parents: 2053
diff changeset
4063 }else if(s->flags&CODEC_FLAG_QP_RD)
06d6a6bade18 qscale + qprd fix
michael
parents: 2053
diff changeset
4064 ff_set_qscale(s, s->qscale + s->dquant);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4065
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4066 wrap_y = s->linesize;
34466835920f simplify
michael
parents: 1777
diff changeset
4067 wrap_c = s->uvlinesize;
34466835920f simplify
michael
parents: 1777
diff changeset
4068 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16;
34466835920f simplify
michael
parents: 1777
diff changeset
4069 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8;
34466835920f simplify
michael
parents: 1777
diff changeset
4070 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8;
34466835920f simplify
michael
parents: 1777
diff changeset
4071
34466835920f simplify
michael
parents: 1777
diff changeset
4072 if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){
2165
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4073 uint8_t *ebuf= s->edge_emu_buffer + 32;
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4074 ff_emulated_edge_mc(ebuf , ptr_y , wrap_y,16,16,mb_x*16,mb_y*16, s->width , s->height);
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4075 ptr_y= ebuf;
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4076 ff_emulated_edge_mc(ebuf+18*wrap_y , ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4077 ptr_cb= ebuf+18*wrap_y;
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4078 ff_emulated_edge_mc(ebuf+18*wrap_y+8, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4079 ptr_cr= ebuf+18*wrap_y+8;
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4080 }
34466835920f simplify
michael
parents: 1777
diff changeset
4081
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4082 if (s->mb_intra) {
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4083 if(s->flags&CODEC_FLAG_INTERLACED_DCT){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4084 int progressive_score, interlaced_score;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4085
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4086 s->interlaced_dct=0;
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4087 progressive_score= s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y, 8)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4088 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y*8, NULL, wrap_y, 8) - 400;
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4089
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4090 if(progressive_score > 0){
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4091 interlaced_score = s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y*2, 8)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4092 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y , NULL, wrap_y*2, 8);
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4093 if(progressive_score > interlaced_score){
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4094 s->interlaced_dct=1;
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4095
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4096 dct_offset= wrap_y;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4097 wrap_y<<=1;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4098 }
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4099 }
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4100 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4101
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4102 s->dsp.get_pixels(s->block[0], ptr_y , wrap_y);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4103 s->dsp.get_pixels(s->block[1], ptr_y + 8, wrap_y);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4104 s->dsp.get_pixels(s->block[2], ptr_y + dct_offset , wrap_y);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4105 s->dsp.get_pixels(s->block[3], ptr_y + dct_offset + 8, wrap_y);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4106
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4107 if(s->flags&CODEC_FLAG_GRAY){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4108 skip_dct[4]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4109 skip_dct[5]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4110 }else{
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4111 s->dsp.get_pixels(s->block[4], ptr_cb, wrap_c);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4112 s->dsp.get_pixels(s->block[5], ptr_cr, wrap_c);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4113 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4114 }else{
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
4115 op_pixels_func (*op_pix)[4];
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
4116 qpel_mc_func (*op_qpix)[16];
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
4117 uint8_t *dest_y, *dest_cb, *dest_cr;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4118
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4119 dest_y = s->dest[0];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4120 dest_cb = s->dest[1];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4121 dest_cr = s->dest[2];
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4122
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4123 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
4124 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
4125 op_qpix= s->dsp.put_qpel_pixels_tab;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4126 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
4127 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
4128 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4129 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4130
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4131 if (s->mv_dir & MV_DIR_FORWARD) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
4132 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
4133 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
4134 op_qpix= s->dsp.avg_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4135 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4136 if (s->mv_dir & MV_DIR_BACKWARD) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
4137 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
4138 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4139
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4140 if(s->flags&CODEC_FLAG_INTERLACED_DCT){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4141 int progressive_score, interlaced_score;
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4142
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4143 s->interlaced_dct=0;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4144 progressive_score= s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y, 8)
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4145 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y*8, ptr_y + wrap_y*8, wrap_y, 8) - 400;
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4146
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4147 if(s->avctx->ildct_cmp == FF_CMP_VSSE) progressive_score -= 400;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4148
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4149 if(progressive_score>0){
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4150 interlaced_score = s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y*2, 8)
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4151 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y , ptr_y + wrap_y , wrap_y*2, 8);
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4152
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4153 if(progressive_score > interlaced_score){
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4154 s->interlaced_dct=1;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4155
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4156 dct_offset= wrap_y;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4157 wrap_y<<=1;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4158 }
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4159 }
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4160 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4161
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
4162 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
4163 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
4164 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
4165 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
4166
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4167 if(s->flags&CODEC_FLAG_GRAY){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4168 skip_dct[4]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4169 skip_dct[5]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4170 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
4171 s->dsp.diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c);
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
4172 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c);
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4173 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4174 /* 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
4175 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
4176 //FIXME optimize
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4177 if(s->dsp.sad[1](NULL, ptr_y , dest_y , wrap_y, 8) < 20*s->qscale) skip_dct[0]= 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4178 if(s->dsp.sad[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20*s->qscale) skip_dct[1]= 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4179 if(s->dsp.sad[1](NULL, ptr_y +dct_offset , dest_y +dct_offset , wrap_y, 8) < 20*s->qscale) skip_dct[2]= 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4180 if(s->dsp.sad[1](NULL, ptr_y +dct_offset+ 8, dest_y +dct_offset+ 8, wrap_y, 8) < 20*s->qscale) skip_dct[3]= 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4181 if(s->dsp.sad[1](NULL, ptr_cb , dest_cb , wrap_c, 8) < 20*s->qscale) skip_dct[4]= 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4182 if(s->dsp.sad[1](NULL, ptr_cr , dest_cr , wrap_c, 8) < 20*s->qscale) skip_dct[5]= 1;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4183 }
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4184 }
34466835920f simplify
michael
parents: 1777
diff changeset
4185
34466835920f simplify
michael
parents: 1777
diff changeset
4186 if(s->avctx->quantizer_noise_shaping){
34466835920f simplify
michael
parents: 1777
diff changeset
4187 if(!skip_dct[0]) get_vissual_weight(weight[0], ptr_y , wrap_y);
34466835920f simplify
michael
parents: 1777
diff changeset
4188 if(!skip_dct[1]) get_vissual_weight(weight[1], ptr_y + 8, wrap_y);
34466835920f simplify
michael
parents: 1777
diff changeset
4189 if(!skip_dct[2]) get_vissual_weight(weight[2], ptr_y + dct_offset , wrap_y);
34466835920f simplify
michael
parents: 1777
diff changeset
4190 if(!skip_dct[3]) get_vissual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y);
34466835920f simplify
michael
parents: 1777
diff changeset
4191 if(!skip_dct[4]) get_vissual_weight(weight[4], ptr_cb , wrap_c);
34466835920f simplify
michael
parents: 1777
diff changeset
4192 if(!skip_dct[5]) get_vissual_weight(weight[5], ptr_cr , wrap_c);
34466835920f simplify
michael
parents: 1777
diff changeset
4193 memcpy(orig[0], s->block[0], sizeof(DCTELEM)*64*6);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4194 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4195
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4196 /* DCT & quantize */
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4197 assert(s->out_format!=FMT_MJPEG || s->qscale==8);
34466835920f simplify
michael
parents: 1777
diff changeset
4198 {
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4199 for(i=0;i<6;i++) {
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4200 if(!skip_dct[i]){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4201 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
4202 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
4203 // 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
4204 // 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
4205 // of improve it. Just INTRADC clipping deserves changes in quantizer
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4206 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4207 }else
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4208 s->block_last_index[i]= -1;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4209 }
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4210 if(s->avctx->quantizer_noise_shaping){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4211 for(i=0;i<6;i++) {
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4212 if(!skip_dct[i]){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4213 s->block_last_index[i] = dct_quantize_refine(s, s->block[i], weight[i], orig[i], i, s->qscale);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4214 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4215 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4216 }
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4217
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4218 if(s->luma_elim_threshold && !s->mb_intra)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4219 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
4220 dct_single_coeff_elimination(s, i, s->luma_elim_threshold);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4221 if(s->chroma_elim_threshold && !s->mb_intra)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4222 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
4223 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold);
1497
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4224
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4225 if(s->flags & CODEC_FLAG_CBP_RD){
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4226 for(i=0;i<6;i++) {
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4227 if(s->block_last_index[i] == -1)
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4228 s->coded_score[i]= INT_MAX/256;
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4229 }
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4230 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4231 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4232
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4233 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4234 s->block_last_index[4]=
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4235 s->block_last_index[5]= 0;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4236 s->block[4][0]=
1011
michaelni
parents: 1007
diff changeset
4237 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale;
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4238 }
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4239
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4240 //non c quantize code returns incorrect block_last_index FIXME
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4241 if(s->alternate_scan && s->dct_quantize != dct_quantize_c){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4242 for(i=0; i<6; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4243 int j;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4244 if(s->block_last_index[i]>0){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4245 for(j=63; j>0; j--){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4246 if(s->block[i][ s->intra_scantable.permutated[j] ]) break;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4247 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4248 s->block_last_index[i]= j;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4249 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4250 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4251 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4252
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4253 /* huffman encode */
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4254 switch(s->codec_id){ //FIXME funct ptr could be slightly faster
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4255 case CODEC_ID_MPEG1VIDEO:
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4256 case CODEC_ID_MPEG2VIDEO:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4257 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4258 case CODEC_ID_MPEG4:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4259 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4260 case CODEC_ID_MSMPEG4V2:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4261 case CODEC_ID_MSMPEG4V3:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4262 case CODEC_ID_WMV1:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4263 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4264 case CODEC_ID_WMV2:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4265 ff_wmv2_encode_mb(s, s->block, motion_x, motion_y); break;
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4266 case CODEC_ID_H261:
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4267 ff_h261_encode_mb(s, s->block, motion_x, motion_y); break;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4268 case CODEC_ID_H263:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4269 case CODEC_ID_H263P:
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4270 case CODEC_ID_FLV1:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4271 case CODEC_ID_RV10:
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
4272 case CODEC_ID_RV20:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4273 h263_encode_mb(s, s->block, motion_x, motion_y); break;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4274 case CODEC_ID_MJPEG:
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4275 mjpeg_encode_mb(s, s->block); break;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4276 default:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4277 assert(0);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4278 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4279 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4280
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
4281 #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
4282
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4283 void ff_mpeg_flush(AVCodecContext *avctx){
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4284 int i;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4285 MpegEncContext *s = avctx->priv_data;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4286
1751
3f1125adbc84 avcodec_flush_buffers() fix
michael
parents: 1749
diff changeset
4287 if(s==NULL || s->picture==NULL)
3f1125adbc84 avcodec_flush_buffers() fix
michael
parents: 1749
diff changeset
4288 return;
3f1125adbc84 avcodec_flush_buffers() fix
michael
parents: 1749
diff changeset
4289
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4290 for(i=0; i<MAX_PICTURE_COUNT; i++){
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4291 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4292 || s->picture[i].type == FF_BUFFER_TYPE_USER))
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4293 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4294 }
1601
a70c07e13e8e flush fix (untested)
michael
parents: 1599
diff changeset
4295 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL;
1395
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4296
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
4297 s->mb_x= s->mb_y= 0;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
4298
1395
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4299 s->parse_context.state= -1;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4300 s->parse_context.frame_start_found= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4301 s->parse_context.overread= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4302 s->parse_context.overread_index= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4303 s->parse_context.index= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4304 s->parse_context.last_index= 0;
1851
07a4c1c4b929 100l (divx5 b frame + seeking + flush fix)
michael
parents: 1848
diff changeset
4305 s->bitstream_buffer_size=0;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4306 }
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4307
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
4308 #ifdef CONFIG_ENCODERS
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
4309 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length)
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4310 {
1810
fc6b38b5dd40 noise reduction with threads bugfix
michael
parents: 1805
diff changeset
4311 const uint16_t *srcw= (uint16_t*)src;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4312 int words= length>>4;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4313 int bits= length&15;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4314 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4315
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4316 if(length==0) return;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4317
1803
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4318 if(words < 16){
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4319 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i]));
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4320 }else if(put_bits_count(pb)&7){
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4321 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i]));
1802
e91dbb5b1a8d activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
michael
parents: 1801
diff changeset
4322 }else{
1803
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4323 for(i=0; put_bits_count(pb)&31; i++)
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4324 put_bits(pb, 8, src[i]);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4325 flush_put_bits(pb);
1803
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4326 memcpy(pbBufPtr(pb), src+i, 2*words-i);
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4327 skip_put_bytes(pb, 2*words-i);
1802
e91dbb5b1a8d activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
michael
parents: 1801
diff changeset
4328 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4329
1803
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4330 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4331 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4332
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4333 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
4334 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4335
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4336 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
4337
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4338 /* mpeg1 */
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
4339 d->mb_skip_run= s->mb_skip_run;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4340 for(i=0; i<3; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4341 d->last_dc[i]= s->last_dc[i];
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4342
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4343 /* statistics */
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4344 d->mv_bits= s->mv_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4345 d->i_tex_bits= s->i_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4346 d->p_tex_bits= s->p_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4347 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
4348 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
4349 d->b_count= s->b_count;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4350 d->skip_count= s->skip_count;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4351 d->misc_bits= s->misc_bits;
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
4352 d->last_bits= 0;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4353
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4354 d->mb_skiped= 0;
912
4a1e6bb1f41c fixing hq + adaptive quant
michaelni
parents: 910
diff changeset
4355 d->qscale= s->qscale;
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4356 d->dquant= s->dquant;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4357 }
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4358
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4359 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
4360 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4361
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4362 memcpy(d->mv, s->mv, 2*4*2*sizeof(int));
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4363 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
4364
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4365 /* mpeg1 */
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
4366 d->mb_skip_run= s->mb_skip_run;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4367 for(i=0; i<3; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4368 d->last_dc[i]= s->last_dc[i];
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4369
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4370 /* statistics */
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4371 d->mv_bits= s->mv_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4372 d->i_tex_bits= s->i_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4373 d->p_tex_bits= s->p_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4374 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
4375 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
4376 d->b_count= s->b_count;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4377 d->skip_count= s->skip_count;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4378 d->misc_bits= s->misc_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4379
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4380 d->mb_intra= s->mb_intra;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4381 d->mb_skiped= s->mb_skiped;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4382 d->mv_type= s->mv_type;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4383 d->mv_dir= s->mv_dir;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4384 d->pb= s->pb;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4385 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4386 d->pb2= s->pb2;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4387 d->tex_pb= s->tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4388 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4389 d->block= s->block;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4390 for(i=0; i<6; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4391 d->block_last_index[i]= s->block_last_index[i];
755
d17846a6c164 fixing interlaced dct + hq mode
michaelni
parents: 754
diff changeset
4392 d->interlaced_dct= s->interlaced_dct;
912
4a1e6bb1f41c fixing hq + adaptive quant
michaelni
parents: 910
diff changeset
4393 d->qscale= s->qscale;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4394 }
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4395
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4396 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4397 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2],
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4398 int *dmin, int *next_block, int motion_x, int motion_y)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4399 {
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4400 int score;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4401 uint8_t *dest_backup[3];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4402
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4403 copy_context_before_encode(s, backup, type);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4404
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4405 s->block= s->blocks[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4406 s->pb= pb[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4407 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4408 s->pb2 = pb2 [*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4409 s->tex_pb= tex_pb[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4410 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4411
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4412 if(*next_block){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4413 memcpy(dest_backup, s->dest, sizeof(s->dest));
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4414 s->dest[0] = s->rd_scratchpad;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4415 s->dest[1] = s->rd_scratchpad + 16*s->linesize;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4416 s->dest[2] = s->rd_scratchpad + 16*s->linesize + 8;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4417 assert(s->linesize >= 32); //FIXME
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4418 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4419
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4420 encode_mb(s, motion_x, motion_y);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4421
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4422 score= put_bits_count(&s->pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4423 if(s->data_partitioning){
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4424 score+= put_bits_count(&s->pb2);
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4425 score+= put_bits_count(&s->tex_pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4426 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4427
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4428 if(s->avctx->mb_decision == FF_MB_DECISION_RD){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4429 MPV_decode_mb(s, s->block);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4430
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
4431 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
4432 score += sse_mb(s) << FF_LAMBDA_SHIFT;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4433 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4434
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4435 if(*next_block){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4436 memcpy(s->dest, dest_backup, sizeof(s->dest));
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4437 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4438
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4439 if(score<*dmin){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4440 *dmin= score;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4441 *next_block^=1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4442
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4443 copy_context_after_encode(best, s, type);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4444 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4445 }
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4446
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4447 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
4448 uint32_t *sq = squareTbl + 256;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4449 int acc=0;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4450 int x,y;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4451
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4452 if(w==16 && h==16)
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4453 return s->dsp.sse[0](NULL, src1, src2, stride, 16);
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4454 else if(w==8 && h==8)
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4455 return s->dsp.sse[1](NULL, src1, src2, stride, 8);
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4456
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4457 for(y=0; y<h; y++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4458 for(x=0; x<w; x++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4459 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
4460 }
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4461 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4462
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4463 assert(acc>=0);
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4464
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4465 return acc;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4466 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4467
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4468 static int sse_mb(MpegEncContext *s){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4469 int w= 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4470 int h= 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4471
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4472 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
4473 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
4474
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4475 if(w==16 && h==16)
2065
9e4bebc39ade noise preserving sum of squares comparission function
michael
parents: 2063
diff changeset
4476 if(s->avctx->mb_cmp == FF_CMP_NSSE){
2066
4bfb146e701b nsse weight
michael
parents: 2065
diff changeset
4477 return s->dsp.nsse[0](s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], s->linesize, 16)
4bfb146e701b nsse weight
michael
parents: 2065
diff changeset
4478 +s->dsp.nsse[1](s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], s->uvlinesize, 8)
4bfb146e701b nsse weight
michael
parents: 2065
diff changeset
4479 +s->dsp.nsse[1](s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], s->uvlinesize, 8);
2065
9e4bebc39ade noise preserving sum of squares comparission function
michael
parents: 2063
diff changeset
4480 }else{
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4481 return s->dsp.sse[0](NULL, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], s->linesize, 16)
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4482 +s->dsp.sse[1](NULL, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], s->uvlinesize, 8)
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4483 +s->dsp.sse[1](NULL, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], s->uvlinesize, 8);
2065
9e4bebc39ade noise preserving sum of squares comparission function
michael
parents: 2063
diff changeset
4484 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4485 else
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4486 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
4487 +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
4488 +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
4489 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4490
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4491 static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4492 MpegEncContext *s= arg;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4493
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4494
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4495 s->me.pre_pass=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4496 s->me.dia_size= s->avctx->pre_dia_size;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4497 s->first_slice_line=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4498 for(s->mb_y= s->end_mb_y-1; s->mb_y >= s->start_mb_y; s->mb_y--) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4499 for(s->mb_x=s->mb_width-1; s->mb_x >=0 ;s->mb_x--) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4500 ff_pre_estimate_p_frame_motion(s, s->mb_x, s->mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4501 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4502 s->first_slice_line=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4503 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4504
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4505 s->me.pre_pass=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4506
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4507 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4508 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4509
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4510 static int estimate_motion_thread(AVCodecContext *c, void *arg){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4511 MpegEncContext *s= arg;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4512
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4513 s->me.dia_size= s->avctx->dia_size;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4514 s->first_slice_line=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4515 for(s->mb_y= s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4516 s->mb_x=0; //for block init below
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4517 ff_init_block_index(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4518 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4519 s->block_index[0]+=2;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4520 s->block_index[1]+=2;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4521 s->block_index[2]+=2;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4522 s->block_index[3]+=2;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4523
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4524 /* compute motion vector & mb_type and store in context */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4525 if(s->pict_type==B_TYPE)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4526 ff_estimate_b_frame_motion(s, s->mb_x, s->mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4527 else
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4528 ff_estimate_p_frame_motion(s, s->mb_x, s->mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4529 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4530 s->first_slice_line=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4531 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4532 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4533 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4534
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4535 static int mb_var_thread(AVCodecContext *c, void *arg){
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4536 MpegEncContext *s= arg;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4537 int mb_x, mb_y;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4538
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4539 for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4540 for(mb_x=0; mb_x < s->mb_width; mb_x++) {
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4541 int xx = mb_x * 16;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4542 int yy = mb_y * 16;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4543 uint8_t *pix = s->new_picture.data[0] + (yy * s->linesize) + xx;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4544 int varc;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4545 int sum = s->dsp.pix_sum(pix, s->linesize);
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4546
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4547 varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4548
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4549 s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4550 s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
4551 s->me.mb_var_sum_temp += varc;
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4552 }
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4553 }
1805
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4554 return 0;
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4555 }
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4556
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4557 static void write_slice_end(MpegEncContext *s){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4558 if(s->codec_id==CODEC_ID_MPEG4){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4559 if(s->partitioned_frame){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4560 ff_mpeg4_merge_partitions(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4561 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4562
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4563 ff_mpeg4_stuffing(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4564 }else if(s->out_format == FMT_MJPEG){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4565 ff_mjpeg_stuffing(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4566 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4567
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4568 align_put_bits(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4569 flush_put_bits(&s->pb);
2428
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
4570
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
4571 if((s->flags&CODEC_FLAG_PASS1) && !s->partitioned_frame)
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
4572 s->misc_bits+= get_bits_diff(s);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4573 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4574
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4575 static int encode_thread(AVCodecContext *c, void *arg){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4576 MpegEncContext *s= arg;
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4577 int mb_x, mb_y, pdif = 0;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4578 int i, j;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4579 MpegEncContext best_s, backup_s;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4580 uint8_t bit_buf[2][MAX_MB_BYTES];
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4581 uint8_t bit_buf2[2][MAX_MB_BYTES];
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4582 uint8_t bit_buf_tex[2][MAX_MB_BYTES];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4583 PutBitContext pb[2], pb2[2], tex_pb[2];
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4584 //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4585
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4586 for(i=0; i<2; i++){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4587 init_put_bits(&pb [i], bit_buf [i], MAX_MB_BYTES);
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4588 init_put_bits(&pb2 [i], bit_buf2 [i], MAX_MB_BYTES);
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4589 init_put_bits(&tex_pb[i], bit_buf_tex[i], MAX_MB_BYTES);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4590 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4591
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4592 s->last_bits= put_bits_count(&s->pb);
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4593 s->mv_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4594 s->misc_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4595 s->i_tex_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4596 s->p_tex_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4597 s->i_count=0;
656
e47fa3e3f2d5 statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents: 652
diff changeset
4598 s->f_count=0;
e47fa3e3f2d5 statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents: 652
diff changeset
4599 s->b_count=0;
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4600 s->skip_count=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4601
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4602 for(i=0; i<3; i++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4603 /* init last dc values */
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4604 /* note: quant matrix value (8) is implied here */
1992
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1991
diff changeset
4605 s->last_dc[i] = 128 << s->intra_dc_precision;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4606
1148
michaelni
parents: 1141
diff changeset
4607 s->current_picture_ptr->error[i] = 0;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4608 }
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
4609 s->mb_skip_run = 0;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4610 memset(s->last_mv, 0, sizeof(s->last_mv));
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
4611
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
4612 s->last_mv_dir = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4613
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4614 switch(s->codec_id){
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4615 case CODEC_ID_H263:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4616 case CODEC_ID_H263P:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4617 case CODEC_ID_FLV1:
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4618 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
4619 break;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4620 case CODEC_ID_MPEG4:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4621 if(s->partitioned_frame)
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4622 ff_mpeg4_init_partitions(s);
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4623 break;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4624 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4625
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4626 s->resync_mb_x=0;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4627 s->resync_mb_y=0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4628 s->first_slice_line = 1;
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4629 s->ptr_lastgob = s->pb.buf;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4630 for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4631 // printf("row %d at %X\n", s->mb_y, (int)s);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4632 s->mb_x=0;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4633 s->mb_y= mb_y;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4634
1652
834922115010 cleanup
michael
parents: 1651
diff changeset
4635 ff_set_qscale(s, s->qscale);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4636 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
4637
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
4638 for(mb_x=0; mb_x < s->mb_width; mb_x++) {
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4639 int xy= mb_y*s->mb_stride + mb_x; // removed const, H261 needs to adjust this
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
4640 int mb_type= s->mb_type[xy];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4641 // int d;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4642 int dmin= INT_MAX;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4643 int dir;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4644
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4645 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < MAX_MB_BYTES){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4646 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4647 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4648 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4649 if(s->data_partitioning){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4650 if( s->pb2 .buf_end - s->pb2 .buf - (put_bits_count(&s-> pb2)>>3) < MAX_MB_BYTES
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4651 || s->tex_pb.buf_end - s->tex_pb.buf - (put_bits_count(&s->tex_pb )>>3) < MAX_MB_BYTES){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4652 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4653 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4654 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4655 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4656
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
4657 s->mb_x = mb_x;
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4658 s->mb_y = mb_y; // moved into loop, can get changed by H.261
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4659 ff_update_block_index(s);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4660
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4661 if(s->codec_id == CODEC_ID_H261){
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4662 ff_h261_reorder_mb_index(s);
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4663 xy= s->mb_y*s->mb_stride + s->mb_x;
2345
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
4664 mb_type= s->mb_type[xy];
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4665 }
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4666
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4667 /* write gob / video packet header */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4668 if(s->rtp_mode){
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4669 int current_packet_size, is_gob_start;
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4670
1801
3f26dfb3eba4 replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents: 1799
diff changeset
4671 current_packet_size= ((put_bits_count(&s->pb)+7)>>3) - (s->ptr_lastgob - s->pb.buf);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4672
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4673 is_gob_start= s->avctx->rtp_payload_size && current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x>0;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4674
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4675 if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0) is_gob_start=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4676
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4677 switch(s->codec_id){
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4678 case CODEC_ID_H263:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4679 case CODEC_ID_H263P:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4680 if(!s->h263_slice_structured)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4681 if(s->mb_x || s->mb_y%s->gob_index) is_gob_start=0;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4682 break;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4683 case CODEC_ID_MPEG2VIDEO:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4684 if(s->mb_x==0 && s->mb_y!=0) is_gob_start=1;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4685 case CODEC_ID_MPEG1VIDEO:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4686 if(s->mb_skip_run) is_gob_start=0;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4687 break;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4688 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4689
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4690 if(is_gob_start){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4691 if(s->start_mb_y != mb_y || mb_x!=0){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4692 write_slice_end(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4693
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4694 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4695 ff_mpeg4_init_partitions(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4696 }
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4697 }
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4698
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4699 assert((put_bits_count(&s->pb)&7) == 0);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4700 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob;
1688
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4701
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4702 if(s->avctx->error_rate && s->resync_mb_x + s->resync_mb_y > 0){
2371
949f84ce470a 10l (dont use codec_id for error simulation)
michael
parents: 2370
diff changeset
4703 int r= put_bits_count(&s->pb)/8 + s->picture_number + 16 + s->mb_x + s->mb_y;
1688
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4704 int d= 100 / s->avctx->error_rate;
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4705 if(r % d == 0){
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4706 current_packet_size=0;
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4707 #ifndef ALT_BITSTREAM_WRITER
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4708 s->pb.buf_ptr= s->ptr_lastgob;
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4709 #endif
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4710 assert(pbBufPtr(&s->pb) == s->ptr_lastgob);
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4711 }
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4712 }
2492
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
4713
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
4714 if (s->avctx->rtp_callback){
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
4715 int number_mb = (mb_y - s->resync_mb_y)*s->mb_width + mb_x - s->resync_mb_x;
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
4716 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, number_mb);
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
4717 }
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4718
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4719 switch(s->codec_id){
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4720 case CODEC_ID_MPEG4:
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4721 ff_mpeg4_encode_video_packet_header(s);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4722 ff_mpeg4_clean_buffers(s);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4723 break;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4724 case CODEC_ID_MPEG1VIDEO:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4725 case CODEC_ID_MPEG2VIDEO:
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4726 ff_mpeg1_encode_slice_header(s);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4727 ff_mpeg1_clean_buffers(s);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4728 break;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4729 case CODEC_ID_H263:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4730 case CODEC_ID_H263P:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4731 h263_encode_gob_header(s, mb_y);
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4732 break;
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
4733 }
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4734
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4735 if(s->flags&CODEC_FLAG_PASS1){
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4736 int bits= put_bits_count(&s->pb);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4737 s->misc_bits+= bits - s->last_bits;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4738 s->last_bits= bits;
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4739 }
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4740
1662
64c370fe6e88 slice flush / position fix
michael
parents: 1661
diff changeset
4741 s->ptr_lastgob += current_packet_size;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4742 s->first_slice_line=1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4743 s->resync_mb_x=mb_x;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4744 s->resync_mb_y=mb_y;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4745 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4746 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4747
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4748 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
4749 && 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
4750 s->first_slice_line=0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4751 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4752
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4753 s->mb_skiped=0;
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4754 s->dquant=0; //only for QP_RD
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4755
2230
53f407cf1f18 comment fix
michael
parents: 2229
diff changeset
4756 if(mb_type & (mb_type-1) || (s->flags & CODEC_FLAG_QP_RD)){ // more than 1 MB type possible or CODEC_FLAG_QP_RD
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4757 int next_block=0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4758 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
4759
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4760 copy_context_before_encode(&backup_s, s, -1);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4761 backup_s.pb= s->pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4762 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
4763 best_s.partitioned_frame= s->partitioned_frame;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4764 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4765 backup_s.pb2= s->pb2;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4766 backup_s.tex_pb= s->tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4767 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4768
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4769 if(mb_type&CANDIDATE_MB_TYPE_INTER){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4770 s->mv_dir = MV_DIR_FORWARD;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4771 s->mv_type = MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4772 s->mb_intra= 0;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4773 s->mv[0][0][0] = s->p_mv_table[xy][0];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4774 s->mv[0][0][1] = s->p_mv_table[xy][1];
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4775 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4776 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4777 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4778 if(mb_type&CANDIDATE_MB_TYPE_INTER_I){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4779 s->mv_dir = MV_DIR_FORWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4780 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4781 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4782 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4783 j= s->field_select[0][i] = s->p_field_select_table[i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4784 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4785 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4786 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4787 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb,
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4788 &dmin, &next_block, 0, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4789 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4790 if(mb_type&CANDIDATE_MB_TYPE_SKIPED){
1494
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1490
diff changeset
4791 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
4792 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
4793 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
4794 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
4795 s->mv[0][0][1] = 0;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4796 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_SKIPED, pb, pb2, tex_pb,
1494
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1490
diff changeset
4797 &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
4798 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4799 if(mb_type&CANDIDATE_MB_TYPE_INTER4V){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4800 s->mv_dir = MV_DIR_FORWARD;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4801 s->mv_type = MV_TYPE_8X8;
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4802 s->mb_intra= 0;
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4803 for(i=0; i<4; i++){
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
4804 s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
4805 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1];
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4806 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4807 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4808 &dmin, &next_block, 0, 0);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4809 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4810 if(mb_type&CANDIDATE_MB_TYPE_FORWARD){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4811 s->mv_dir = MV_DIR_FORWARD;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4812 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4813 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4814 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
4815 s->mv[0][0][1] = s->b_forw_mv_table[xy][1];
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4816 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4817 &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
4818 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4819 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4820 s->mv_dir = MV_DIR_BACKWARD;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4821 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4822 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4823 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
4824 s->mv[1][0][1] = s->b_back_mv_table[xy][1];
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4825 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4826 &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
4827 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4828 if(mb_type&CANDIDATE_MB_TYPE_BIDIR){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4829 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
4830 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4831 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4832 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
4833 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
4834 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
4835 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1];
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4836 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4837 &dmin, &next_block, 0, 0);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4838 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4839 if(mb_type&CANDIDATE_MB_TYPE_DIRECT){
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4840 int mx= s->b_direct_mv_table[xy][0];
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4841 int my= s->b_direct_mv_table[xy][1];
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4842
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4843 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
4844 s->mb_intra= 0;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4845 ff_mpeg4_set_direct_mv(s, mx, my);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4846 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb,
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4847 &dmin, &next_block, mx, my);
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4848 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4849 if(mb_type&CANDIDATE_MB_TYPE_FORWARD_I){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4850 s->mv_dir = MV_DIR_FORWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4851 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4852 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4853 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4854 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4855 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4856 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4857 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4858 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb,
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4859 &dmin, &next_block, 0, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4860 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4861 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD_I){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4862 s->mv_dir = MV_DIR_BACKWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4863 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4864 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4865 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4866 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4867 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4868 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4869 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4870 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb,
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4871 &dmin, &next_block, 0, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4872 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4873 if(mb_type&CANDIDATE_MB_TYPE_BIDIR_I){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4874 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4875 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4876 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4877 for(dir=0; dir<2; dir++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4878 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4879 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4880 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4881 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4882 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4883 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4884 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb,
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4885 &dmin, &next_block, 0, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4886 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4887 if(mb_type&CANDIDATE_MB_TYPE_INTRA){
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
4888 s->mv_dir = 0;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4889 s->mv_type = MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4890 s->mb_intra= 1;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4891 s->mv[0][0][0] = 0;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4892 s->mv[0][0][1] = 0;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4893 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4894 &dmin, &next_block, 0, 0);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4895 if(s->h263_pred || s->h263_aic){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4896 if(best_s.mb_intra)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4897 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4898 else
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4899 ff_clean_intra_table_entries(s); //old mode?
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4900 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4901 }
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4902
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4903 if(s->flags & CODEC_FLAG_QP_RD){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4904 if(best_s.mv_type==MV_TYPE_16X16 && !(best_s.mv_dir&MV_DIRECT)){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4905 const int last_qp= backup_s.qscale;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4906 int dquant, dir, qp, dc[6];
1617
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4907 DCTELEM ac[6][16];
1623
1dd437affd27 qprd with b frames fix
michael
parents: 1622
diff changeset
4908 const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0;
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4909
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4910 assert(backup_s.dquant == 0);
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4911
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4912 //FIXME intra
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4913 s->mv_dir= best_s.mv_dir;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4914 s->mv_type = MV_TYPE_16X16;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4915 s->mb_intra= best_s.mb_intra;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4916 s->mv[0][0][0] = best_s.mv[0][0][0];
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4917 s->mv[0][0][1] = best_s.mv[0][0][1];
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4918 s->mv[1][0][0] = best_s.mv[1][0][0];
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4919 s->mv[1][0][1] = best_s.mv[1][0][1];
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4920
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4921 dir= s->pict_type == B_TYPE ? 2 : 1;
1623
1dd437affd27 qprd with b frames fix
michael
parents: 1622
diff changeset
4922 if(last_qp + dir > s->avctx->qmax) dir= -dir;
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4923 for(dquant= dir; dquant<=2 && dquant>=-2; dquant += dir){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4924 qp= last_qp + dquant;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4925 if(qp < s->avctx->qmin || qp > s->avctx->qmax)
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4926 break;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4927 backup_s.dquant= dquant;
2229
5ca45491294b qprd + mpeg2 segfault fix
michael
parents: 2213
diff changeset
4928 if(s->mb_intra && s->dc_val[0]){
1617
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4929 for(i=0; i<6; i++){
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4930 dc[i]= s->dc_val[0][ s->block_index[i] ];
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4931 memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(DCTELEM)*16);
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4932 }
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4933 }
1617
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4934
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4935 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb,
1623
1dd437affd27 qprd with b frames fix
michael
parents: 1622
diff changeset
4936 &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]);
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4937 if(best_s.qscale != qp){
2229
5ca45491294b qprd + mpeg2 segfault fix
michael
parents: 2213
diff changeset
4938 if(s->mb_intra && s->dc_val[0]){
1617
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4939 for(i=0; i<6; i++){
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4940 s->dc_val[0][ s->block_index[i] ]= dc[i];
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4941 memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM)*16);
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
4942 }
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4943 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4944 if(dir > 0 && dquant==dir){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4945 dquant= 0;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4946 dir= -dir;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4947 }else
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4948 break;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4949 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4950 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4951 qp= best_s.qscale;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4952 s->current_picture.qscale_table[xy]= qp;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4953 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4954 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4955
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4956 copy_context_after_encode(s, &best_s, -1);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4957
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4958 pb_bits_count= put_bits_count(&s->pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4959 flush_put_bits(&s->pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4960 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4961 s->pb= backup_s.pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4962
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4963 if(s->data_partitioning){
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4964 pb2_bits_count= put_bits_count(&s->pb2);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4965 flush_put_bits(&s->pb2);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4966 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4967 s->pb2= backup_s.pb2;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4968
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4969 tex_pb_bits_count= put_bits_count(&s->tex_pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4970 flush_put_bits(&s->tex_pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4971 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
4972 s->tex_pb= backup_s.tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4973 }
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4974 s->last_bits= put_bits_count(&s->pb);
1451
62c16edd18c6 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents: 1444
diff changeset
4975
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4976 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4977 ff_h263_update_motion_val(s);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4978
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4979 if(next_block==0){ //FIXME 16 vs linesize16
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4980 s->dsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4981 s->dsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4982 s->dsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4983 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4984
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4985 if(s->avctx->mb_decision == FF_MB_DECISION_BITS)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4986 MPV_decode_mb(s, s->block);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4987 } else {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4988 int motion_x, motion_y;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4989 s->mv_type=MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4990 // only one MB-Type possible
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
4991
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4992 switch(mb_type){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4993 case CANDIDATE_MB_TYPE_INTRA:
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
4994 s->mv_dir = 0;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4995 s->mb_intra= 1;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4996 motion_x= s->mv[0][0][0] = 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4997 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
4998 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4999 case CANDIDATE_MB_TYPE_INTER:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5000 s->mv_dir = MV_DIR_FORWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5001 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5002 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
5003 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
5004 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5005 case CANDIDATE_MB_TYPE_INTER_I:
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5006 s->mv_dir = MV_DIR_FORWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5007 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5008 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5009 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5010 j= s->field_select[0][i] = s->p_field_select_table[i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5011 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5012 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5013 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5014 motion_x = motion_y = 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5015 break;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5016 case CANDIDATE_MB_TYPE_INTER4V:
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5017 s->mv_dir = MV_DIR_FORWARD;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5018 s->mv_type = MV_TYPE_8X8;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5019 s->mb_intra= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5020 for(i=0; i<4; i++){
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
5021 s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
5022 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5023 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5024 motion_x= motion_y= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5025 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5026 case CANDIDATE_MB_TYPE_DIRECT:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5027 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5028 s->mb_intra= 0;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5029 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
5030 motion_y=s->b_direct_mv_table[xy][1];
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
5031 ff_mpeg4_set_direct_mv(s, motion_x, motion_y);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5032 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5033 case CANDIDATE_MB_TYPE_BIDIR:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5034 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5035 s->mb_intra= 0;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5036 motion_x=0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5037 motion_y=0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5038 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
5039 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
5040 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
5041 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
5042 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5043 case CANDIDATE_MB_TYPE_BACKWARD:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5044 s->mv_dir = MV_DIR_BACKWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5045 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5046 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
5047 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
5048 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5049 case CANDIDATE_MB_TYPE_FORWARD:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5050 s->mv_dir = MV_DIR_FORWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5051 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5052 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
5053 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
5054 // printf(" %d %d ", motion_x, motion_y);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5055 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5056 case CANDIDATE_MB_TYPE_FORWARD_I:
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5057 s->mv_dir = MV_DIR_FORWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5058 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5059 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5060 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5061 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5062 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5063 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5064 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5065 motion_x=motion_y=0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5066 break;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5067 case CANDIDATE_MB_TYPE_BACKWARD_I:
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5068 s->mv_dir = MV_DIR_BACKWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5069 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5070 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5071 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5072 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5073 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5074 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5075 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5076 motion_x=motion_y=0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5077 break;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5078 case CANDIDATE_MB_TYPE_BIDIR_I:
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5079 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5080 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5081 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5082 for(dir=0; dir<2; dir++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5083 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5084 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5085 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5086 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5087 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5088 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5089 motion_x=motion_y=0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5090 break;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5091 default:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5092 motion_x=motion_y=0; //gcc warning fix
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
5093 av_log(s->avctx, AV_LOG_ERROR, "illegal MB type\n");
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5094 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
5095
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5096 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
5097
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
5098 // RAL: Update last macrobloc type
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
5099 s->last_mv_dir = s->mv_dir;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5100
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5101 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5102 ff_h263_update_motion_val(s);
1451
62c16edd18c6 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents: 1444
diff changeset
5103
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5104 MPV_decode_mb(s, s->block);
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 244
diff changeset
5105 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
5106
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5107 /* 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
5108 if(s->mb_intra /* && I,P,S_TYPE */){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5109 s->p_mv_table[xy][0]=0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5110 s->p_mv_table[xy][1]=0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5111 }
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5112
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5113 if(s->flags&CODEC_FLAG_PSNR){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5114 int w= 16;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5115 int h= 16;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5116
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5117 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
5118 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
5119
1148
michaelni
parents: 1141
diff changeset
5120 s->current_picture_ptr->error[0] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5121 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
5122 s->dest[0], w, h, s->linesize);
1148
michaelni
parents: 1141
diff changeset
5123 s->current_picture_ptr->error[1] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5124 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
5125 s->dest[1], w>>1, h>>1, s->uvlinesize);
1148
michaelni
parents: 1141
diff changeset
5126 s->current_picture_ptr->error[2] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5127 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
5128 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
5129 }
2345
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
5130 if(s->loop_filter){
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
5131 if(s->out_format == FMT_H263)
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
5132 ff_h263_loop_filter(s);
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
5133 }
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
5134 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5135 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
5136 }
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
5137
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5138 //not beautifull here but we must write it before flushing so it has to be here
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5139 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE)
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 207
diff changeset
5140 msmpeg4_encode_ext_header(s);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5141
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5142 write_slice_end(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5143
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
5144 /* Send the last GOB if RTP */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5145 if (s->avctx->rtp_callback) {
2492
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
5146 int number_mb = (mb_y - s->resync_mb_y)*s->mb_width - s->resync_mb_x;
234
5fc0c3af3fe4 alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents: 233
diff changeset
5147 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob;
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
5148 /* Call the RTP callback to send the last GOB */
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5149 emms_c();
2492
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
5150 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb);
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
5151 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5152
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5153 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5154 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5155
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5156 #define MERGE(field) dst->field += src->field; src->field=0
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5157 static void merge_context_after_me(MpegEncContext *dst, MpegEncContext *src){
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5158 MERGE(me.scene_change_score);
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5159 MERGE(me.mc_mb_var_sum_temp);
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5160 MERGE(me.mb_var_sum_temp);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5161 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5162
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5163 static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5164 int i;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5165
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5166 MERGE(dct_count[0]); //note, the other dct vars are not part of the context
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5167 MERGE(dct_count[1]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5168 MERGE(mv_bits);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5169 MERGE(i_tex_bits);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5170 MERGE(p_tex_bits);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5171 MERGE(i_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5172 MERGE(f_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5173 MERGE(b_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5174 MERGE(skip_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5175 MERGE(misc_bits);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5176 MERGE(error_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5177 MERGE(padding_bug_score);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5178
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5179 if(dst->avctx->noise_reduction){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5180 for(i=0; i<64; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5181 MERGE(dct_error_sum[0][i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5182 MERGE(dct_error_sum[1][i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5183 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5184 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5185
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5186 assert(put_bits_count(&src->pb) % 8 ==0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5187 assert(put_bits_count(&dst->pb) % 8 ==0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5188 ff_copy_bits(&dst->pb, src->pb.buf, put_bits_count(&src->pb));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5189 flush_put_bits(&dst->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5190 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5191
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5192 static void encode_picture(MpegEncContext *s, int picture_number)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5193 {
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
5194 int i;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5195 int bits;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5196
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5197 s->picture_number = picture_number;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5198
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5199 /* Reset the average MB variance */
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5200 s->me.mb_var_sum_temp =
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5201 s->me.mc_mb_var_sum_temp = 0;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5202
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5203 /* we need to initialize some time vars before we can encode b-frames */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5204 // RAL: Condition added for MPEG1VIDEO
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5205 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4))
1834
41c324b09fcc 100l (field picture decoding fix)
michael
parents: 1833
diff changeset
5206 ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5207
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5208 s->me.scene_change_score=0;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5209
2053
c46e203dd698 change qscale -> lambda for the motion estimation
michael
parents: 2048
diff changeset
5210 // s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5211
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5212 if(s->pict_type==I_TYPE){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5213 if(s->msmpeg4_version >= 3) s->no_rounding=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5214 else s->no_rounding=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5215 }else if(s->pict_type!=B_TYPE){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5216 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5217 s->no_rounding ^= 1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5218 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5219
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5220 s->mb_intra=0; //for the rate distoration & bit compare functions
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5221 for(i=1; i<s->avctx->thread_count; i++){
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
5222 ff_update_duplicate_context(s->thread_context[i], s);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5223 }
1962
1d5abf80fa41 minor motion estimation cleanup
michael
parents: 1958
diff changeset
5224
1d5abf80fa41 minor motion estimation cleanup
michael
parents: 1958
diff changeset
5225 ff_init_me(s);
1d5abf80fa41 minor motion estimation cleanup
michael
parents: 1958
diff changeset
5226
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5227 /* Estimate motion for every MB */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5228 if(s->pict_type != I_TYPE){
1955
5dafb10e0252 reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents: 1948
diff changeset
5229 if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5230 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5231 s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5232 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5233 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5234
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5235 s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5236 }else /* if(s->pict_type == I_TYPE) */{
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5237 /* I-Frame */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5238 for(i=0; i<s->mb_stride*s->mb_height; i++)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5239 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5240
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5241 if(!s->fixed_qscale){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5242 /* finding spatial complexity for I-frame rate control */
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
5243 s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5244 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5245 }
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
5246 for(i=1; i<s->avctx->thread_count; i++){
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
5247 merge_context_after_me(s, s->thread_context[i]);
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
5248 }
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5249 s->current_picture.mc_mb_var_sum= s->current_picture_ptr->mc_mb_var_sum= s->me.mc_mb_var_sum_temp;
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5250 s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5251 emms_c();
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5252
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5253 if(s->me.scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5254 s->pict_type= I_TYPE;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5255 for(i=0; i<s->mb_stride*s->mb_height; i++)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5256 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5257 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5258 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5259
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5260 if(!s->umvplus){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5261 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5262 s->f_code= ff_get_best_fcode(s, s->p_mv_table, CANDIDATE_MB_TYPE_INTER);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5263
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5264 if(s->flags & CODEC_FLAG_INTERLACED_ME){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5265 int a,b;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5266 a= ff_get_best_fcode(s, s->p_field_mv_table[0][0], CANDIDATE_MB_TYPE_INTER_I); //FIXME field_select
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5267 b= ff_get_best_fcode(s, s->p_field_mv_table[1][1], CANDIDATE_MB_TYPE_INTER_I);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5268 s->f_code= FFMAX(s->f_code, FFMAX(a,b));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5269 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5270
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5271 ff_fix_long_p_mvs(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5272 ff_fix_long_mvs(s, NULL, 0, s->p_mv_table, s->f_code, CANDIDATE_MB_TYPE_INTER, 0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5273 if(s->flags & CODEC_FLAG_INTERLACED_ME){
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
5274 int j;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5275 for(i=0; i<2; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5276 for(j=0; j<2; j++)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5277 ff_fix_long_mvs(s, s->p_field_select_table[i], j,
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5278 s->p_field_mv_table[i][j], s->f_code, CANDIDATE_MB_TYPE_INTER_I, 0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5279 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5280 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5281 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5282
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5283 if(s->pict_type==B_TYPE){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5284 int a, b;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5285
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5286 a = ff_get_best_fcode(s, s->b_forw_mv_table, CANDIDATE_MB_TYPE_FORWARD);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5287 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, CANDIDATE_MB_TYPE_BIDIR);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5288 s->f_code = FFMAX(a, b);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5289
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5290 a = ff_get_best_fcode(s, s->b_back_mv_table, CANDIDATE_MB_TYPE_BACKWARD);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5291 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, CANDIDATE_MB_TYPE_BIDIR);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5292 s->b_code = FFMAX(a, b);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5293
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5294 ff_fix_long_mvs(s, NULL, 0, s->b_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_FORWARD, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5295 ff_fix_long_mvs(s, NULL, 0, s->b_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BACKWARD, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5296 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_BIDIR, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5297 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BIDIR, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5298 if(s->flags & CODEC_FLAG_INTERLACED_ME){
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
5299 int dir, j;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5300 for(dir=0; dir<2; dir++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5301 for(i=0; i<2; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5302 for(j=0; j<2; j++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5303 int type= dir ? (CANDIDATE_MB_TYPE_BACKWARD_I|CANDIDATE_MB_TYPE_BIDIR_I)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5304 : (CANDIDATE_MB_TYPE_FORWARD_I |CANDIDATE_MB_TYPE_BIDIR_I);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5305 ff_fix_long_mvs(s, s->b_field_select_table[dir][i], j,
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5306 s->b_field_mv_table[dir][i][j], dir ? s->b_code : s->f_code, type, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5307 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5308 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5309 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5310 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5311 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5312 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5313
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5314 if (!s->fixed_qscale)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5315 s->current_picture.quality = ff_rate_estimate_qscale(s); //FIXME pic_ptr
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5316
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5317 if(s->adaptive_quant){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5318 switch(s->codec_id){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5319 case CODEC_ID_MPEG4:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5320 ff_clean_mpeg4_qscales(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5321 break;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5322 case CODEC_ID_H263:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5323 case CODEC_ID_H263P:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5324 case CODEC_ID_FLV1:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5325 ff_clean_h263_qscales(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5326 break;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5327 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5328
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5329 s->lambda= s->lambda_table[0];
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5330 //FIXME broken
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5331 }else
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5332 s->lambda= s->current_picture.quality;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5333 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5334 update_qscale(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5335
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5336 if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(s->flags & CODEC_FLAG_QSCALE))
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5337 s->qscale= 3; //reduce cliping problems
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5338
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5339 if (s->out_format == FMT_MJPEG) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5340 /* for mjpeg, we do include qscale in the matrix */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5341 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0];
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5342 for(i=1;i<64;i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5343 int j= s->dsp.idct_permutation[i];
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5344
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5345 s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5346 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5347 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16,
2385
4605a8b188c3 warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents: 2382
diff changeset
5348 s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5349 s->qscale= 8;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5350 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5351
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5352 //FIXME var duplication
2235
0c04463f79d8 10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2231
diff changeset
5353 s->current_picture_ptr->key_frame=
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5354 s->current_picture.key_frame= s->pict_type == I_TYPE; //FIXME pic_ptr
2235
0c04463f79d8 10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2231
diff changeset
5355 s->current_picture_ptr->pict_type=
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5356 s->current_picture.pict_type= s->pict_type;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5357
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5358 if(s->current_picture.key_frame)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5359 s->picture_in_gop_number=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5360
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5361 s->last_bits= put_bits_count(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5362 switch(s->out_format) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5363 case FMT_MJPEG:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5364 mjpeg_picture_header(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5365 break;
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
5366 case FMT_H261:
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
5367 ff_h261_encode_picture_header(s, picture_number);
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
5368 break;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5369 case FMT_H263:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5370 if (s->codec_id == CODEC_ID_WMV2)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5371 ff_wmv2_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5372 else if (s->h263_msmpeg4)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5373 msmpeg4_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5374 else if (s->h263_pred)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5375 mpeg4_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5376 else if (s->codec_id == CODEC_ID_RV10)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5377 rv10_encode_picture_header(s, picture_number);
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
5378 else if (s->codec_id == CODEC_ID_RV20)
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
5379 rv20_encode_picture_header(s, picture_number);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5380 else if (s->codec_id == CODEC_ID_FLV1)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5381 ff_flv_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5382 else
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5383 h263_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5384 break;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5385 case FMT_MPEG1:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5386 mpeg1_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5387 break;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5388 case FMT_H264:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5389 break;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5390 default:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5391 assert(0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5392 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5393 bits= put_bits_count(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5394 s->header_bits= bits - s->last_bits;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5395
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5396 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5397 update_duplicate_context_after_me(s->thread_context[i], s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5398 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5399 s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5400 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5401 merge_context_after_encode(s, s->thread_context[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5402 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5403 emms_c();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5404 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
5405
1686
68abbec33289 Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents: 1685
diff changeset
5406 #endif //CONFIG_ENCODERS
68abbec33289 Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents: 1685
diff changeset
5407
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
5408 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block){
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5409 const int intra= s->mb_intra;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5410 int i;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5411
1599
079239998a38 10l (fixes dct coeff noise reduction)
michael
parents: 1598
diff changeset
5412 s->dct_count[intra]++;
079239998a38 10l (fixes dct coeff noise reduction)
michael
parents: 1598
diff changeset
5413
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5414 for(i=0; i<64; i++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5415 int level= block[i];
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5416
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5417 if(level){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5418 if(level>0){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5419 s->dct_error_sum[intra][i] += level;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5420 level -= s->dct_offset[intra][i];
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5421 if(level<0) level=0;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5422 }else{
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5423 s->dct_error_sum[intra][i] -= level;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5424 level += s->dct_offset[intra][i];
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5425 if(level>0) level=0;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5426 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5427 block[i]= level;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5428 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5429 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5430 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5431
1686
68abbec33289 Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents: 1685
diff changeset
5432 #ifdef CONFIG_ENCODERS
68abbec33289 Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents: 1685
diff changeset
5433
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5434 static int dct_quantize_trellis_c(MpegEncContext *s,
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5435 DCTELEM *block, int n,
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5436 int qscale, int *overflow){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5437 const int *qmat;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
5438 const uint8_t *scantable= s->intra_scantable.scantable;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5439 const uint8_t *perm_scantable= s->intra_scantable.permutated;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5440 int max=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5441 unsigned int threshold1, threshold2;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5442 int bias=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5443 int run_tab[65];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5444 int level_tab[65];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5445 int score_tab[65];
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5446 int survivor[65];
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5447 int survivor_count;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5448 int last_run=0;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5449 int last_level=0;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5450 int last_score= 0;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5451 int last_i;
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5452 int coeff[2][64];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5453 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
5454 int qmul, qadd, start_i, last_non_zero, i, dc;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5455 const int esc_length= s->ac_esc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5456 uint8_t * length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5457 uint8_t * last_length;
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
5458 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5459
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
5460 s->dsp.fdct (block);
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5461
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5462 if(s->dct_error_sum)
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
5463 s->denoise_dct(s, block);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5464 qmul= qscale*16;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5465 qadd= ((qscale-1)|1)*8;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5466
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5467 if (s->mb_intra) {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5468 int q;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5469 if (!s->h263_aic) {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5470 if (n < 4)
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5471 q = s->y_dc_scale;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5472 else
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5473 q = s->c_dc_scale;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5474 q = q << 3;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5475 } else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5476 /* For AIC we skip quant/dequant of INTRADC */
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5477 q = 1 << 3;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5478 qadd=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5479 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5480
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5481 /* note: block[0] is assumed to be positive */
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5482 block[0] = (block[0] + (q >> 1)) / q;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5483 start_i = 1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5484 last_non_zero = 0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5485 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
5486 if(s->mpeg_quant || s->out_format == FMT_MPEG1)
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5487 bias= 1<<(QMAT_SHIFT-1);
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5488 length = s->intra_ac_vlc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5489 last_length= s->intra_ac_vlc_last_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5490 } else {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5491 start_i = 0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5492 last_non_zero = -1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5493 qmat = s->q_inter_matrix[qscale];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5494 length = s->inter_ac_vlc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5495 last_length= s->inter_ac_vlc_last_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5496 }
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5497 last_i= start_i;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5498
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5499 threshold1= (1<<QMAT_SHIFT) - bias - 1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5500 threshold2= (threshold1<<1);
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5501
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5502 for(i=63; i>=start_i; i--) {
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5503 const int j = scantable[i];
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5504 int level = block[j] * qmat[j];
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5505
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5506 if(((unsigned)(level+threshold1))>threshold2){
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5507 last_non_zero = i;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5508 break;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5509 }
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5510 }
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5511
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5512 for(i=start_i; i<=last_non_zero; i++) {
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5513 const int j = scantable[i];
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5514 int level = block[j] * qmat[j];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5515
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5516 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5517 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5518 if(((unsigned)(level+threshold1))>threshold2){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5519 if(level>0){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5520 level= (bias + level)>>QMAT_SHIFT;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5521 coeff[0][i]= level;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5522 coeff[1][i]= level-1;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5523 // coeff[2][k]= level-2;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5524 }else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5525 level= (bias - level)>>QMAT_SHIFT;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5526 coeff[0][i]= -level;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5527 coeff[1][i]= -level+1;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5528 // coeff[2][k]= -level+2;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5529 }
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5530 coeff_count[i]= FFMIN(level, 2);
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5531 assert(coeff_count[i]);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5532 max |=level;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5533 }else{
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5534 coeff[0][i]= (level>>31)|1;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5535 coeff_count[i]= 1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5536 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5537 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5538
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5539 *overflow= s->max_qcoeff < max; //overflow might have happend
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5540
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5541 if(last_non_zero < start_i){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5542 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM));
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5543 return last_non_zero;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5544 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5545
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5546 score_tab[start_i]= 0;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5547 survivor[0]= start_i;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5548 survivor_count= 1;
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
5549
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5550 for(i=start_i; i<=last_non_zero; i++){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5551 int level_index, j;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5552 const int dct_coeff= ABS(block[ scantable[i] ]);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5553 const int zero_distoration= dct_coeff*dct_coeff;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5554 int best_score=256*256*256*120;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5555 for(level_index=0; level_index < coeff_count[i]; level_index++){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5556 int distoration;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5557 int level= coeff[level_index][i];
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5558 const int alevel= ABS(level);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5559 int unquant_coeff;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5560
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5561 assert(level);
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5562
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5563 if(s->out_format == FMT_H263){
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5564 unquant_coeff= alevel*qmul + qadd;
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5565 }else{ //MPEG1
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5566 j= s->dsp.idct_permutation[ scantable[i] ]; //FIXME optimize
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5567 if(s->mb_intra){
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5568 unquant_coeff = (int)( alevel * qscale * s->intra_matrix[j]) >> 3;
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5569 unquant_coeff = (unquant_coeff - 1) | 1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5570 }else{
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5571 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4;
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5572 unquant_coeff = (unquant_coeff - 1) | 1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5573 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5574 unquant_coeff<<= 3;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5575 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5576
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5577 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5578 level+=64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5579 if((level&(~127)) == 0){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5580 for(j=survivor_count-1; j>=0; j--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5581 int run= i - survivor[j];
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5582 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5583 score += score_tab[i-run];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5584
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5585 if(score < best_score){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5586 best_score= score;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5587 run_tab[i+1]= run;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5588 level_tab[i+1]= level-64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5589 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5590 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5591
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5592 if(s->out_format == FMT_H263){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5593 for(j=survivor_count-1; j>=0; j--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5594 int run= i - survivor[j];
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5595 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5596 score += score_tab[i-run];
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5597 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5598 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5599 last_run= run;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5600 last_level= level-64;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5601 last_i= i+1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5602 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5603 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5604 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5605 }else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5606 distoration += esc_length*lambda;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5607 for(j=survivor_count-1; j>=0; j--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5608 int run= i - survivor[j];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5609 int score= distoration + score_tab[i-run];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5610
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5611 if(score < best_score){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5612 best_score= score;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5613 run_tab[i+1]= run;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5614 level_tab[i+1]= level-64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5615 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5616 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5617
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5618 if(s->out_format == FMT_H263){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5619 for(j=survivor_count-1; j>=0; j--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5620 int run= i - survivor[j];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5621 int score= distoration + score_tab[i-run];
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5622 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5623 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5624 last_run= run;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5625 last_level= level-64;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5626 last_i= i+1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5627 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5628 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5629 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5630 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5631 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5632
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5633 score_tab[i+1]= best_score;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5634
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5635 //Note: there is a vlc code in mpeg4 which is 1 bit shorter then another one with a shorter run and the same level
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5636 if(last_non_zero <= 27){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5637 for(; survivor_count; survivor_count--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5638 if(score_tab[ survivor[survivor_count-1] ] <= best_score)
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5639 break;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5640 }
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5641 }else{
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5642 for(; survivor_count; survivor_count--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5643 if(score_tab[ survivor[survivor_count-1] ] <= best_score + lambda)
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5644 break;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5645 }
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
5646 }
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5647
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5648 survivor[ survivor_count++ ]= i+1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5649 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5650
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5651 if(s->out_format != FMT_H263){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5652 last_score= 256*256*256*120;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5653 for(i= survivor[0]; i<=last_non_zero + 1; i++){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5654 int score= score_tab[i];
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5655 if(i) score += lambda*2; //FIXME exacter?
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5656
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5657 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5658 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5659 last_i= i;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5660 last_level= level_tab[i];
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5661 last_run= run_tab[i];
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5662 }
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5663 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5664 }
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5665
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5666 s->coded_score[n] = last_score;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5667
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5668 dc= ABS(block[0]);
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5669 last_non_zero= last_i - 1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5670 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM));
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5671
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5672 if(last_non_zero < start_i)
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5673 return last_non_zero;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5674
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5675 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
5676 int best_level= 0;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5677 int best_score= dc * dc;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5678
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5679 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
5680 int level= coeff[i][0];
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5681 int alevel= ABS(level);
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5682 int unquant_coeff, score, distortion;
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5683
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5684 if(s->out_format == FMT_H263){
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5685 unquant_coeff= (alevel*qmul + qadd)>>3;
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5686 }else{ //MPEG1
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5687 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4;
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5688 unquant_coeff = (unquant_coeff - 1) | 1;
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5689 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5690 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
5691 unquant_coeff<<= 3 + 3;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5692
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5693 distortion= (unquant_coeff - dc) * (unquant_coeff - dc);
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5694 level+=64;
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5695 if((level&(~127)) == 0) score= distortion + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda;
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5696 else score= distortion + esc_length*lambda;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5697
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5698 if(score < best_score){
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5699 best_score= score;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5700 best_level= level - 64;
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5701 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5702 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5703 block[0]= best_level;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5704 s->coded_score[n] = best_score - dc*dc;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5705 if(best_level == 0) return -1;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5706 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
5707 }
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5708
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5709 i= last_i;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5710 assert(last_level);
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5711
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5712 block[ perm_scantable[last_non_zero] ]= last_level;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5713 i -= last_run + 1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5714
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5715 for(; i>start_i; i -= run_tab[i] + 1){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5716 block[ perm_scantable[i-1] ]= level_tab[i];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5717 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5718
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5719 return last_non_zero;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5720 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5721
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5722 //#define REFINE_STATS 1
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5723 static int16_t basis[64][64];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5724
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5725 static void build_basis(uint8_t *perm){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5726 int i, j, x, y;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5727 emms_c();
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5728 for(i=0; i<8; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5729 for(j=0; j<8; j++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5730 for(y=0; y<8; y++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5731 for(x=0; x<8; x++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5732 double s= 0.25*(1<<BASIS_SHIFT);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5733 int index= 8*i + j;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5734 int perm_index= perm[index];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5735 if(i==0) s*= sqrt(0.5);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5736 if(j==0) s*= sqrt(0.5);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5737 basis[perm_index][8*x + y]= lrintf(s * cos((M_PI/8.0)*i*(x+0.5)) * cos((M_PI/8.0)*j*(y+0.5)));
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5738 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5739 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5740 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5741 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5742 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5743
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5744 static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise?
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5745 DCTELEM *block, int16_t *weight, DCTELEM *orig,
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5746 int n, int qscale){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5747 int16_t rem[64];
2289
5443c3fc2448 Quantizer noise shaping crashes on SSE2 machines patch by (Milan Cutka <cutka at szm dot sk>)
michael
parents: 2266
diff changeset
5748 DCTELEM d1[64] __align16;
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5749 const int *qmat;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5750 const uint8_t *scantable= s->intra_scantable.scantable;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5751 const uint8_t *perm_scantable= s->intra_scantable.permutated;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5752 // unsigned int threshold1, threshold2;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5753 // int bias=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5754 int run_tab[65];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5755 int prev_run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5756 int prev_level=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5757 int qmul, qadd, start_i, last_non_zero, i, dc;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5758 uint8_t * length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5759 uint8_t * last_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5760 int lambda;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5761 int rle_index, run, q, sum;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5762 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5763 static int count=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5764 static int after_last=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5765 static int to_zero=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5766 static int from_zero=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5767 static int raise=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5768 static int lower=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5769 static int messed_sign=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5770 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5771
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5772 if(basis[0][0] == 0)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5773 build_basis(s->dsp.idct_permutation);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5774
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5775 qmul= qscale*2;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5776 qadd= (qscale-1)|1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5777 if (s->mb_intra) {
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5778 if (!s->h263_aic) {
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5779 if (n < 4)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5780 q = s->y_dc_scale;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5781 else
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5782 q = s->c_dc_scale;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5783 } else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5784 /* For AIC we skip quant/dequant of INTRADC */
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5785 q = 1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5786 qadd=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5787 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5788 q <<= RECON_SHIFT-3;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5789 /* note: block[0] is assumed to be positive */
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5790 dc= block[0]*q;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5791 // block[0] = (block[0] + (q >> 1)) / q;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5792 start_i = 1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5793 qmat = s->q_intra_matrix[qscale];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5794 // if(s->mpeg_quant || s->out_format == FMT_MPEG1)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5795 // bias= 1<<(QMAT_SHIFT-1);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5796 length = s->intra_ac_vlc_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5797 last_length= s->intra_ac_vlc_last_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5798 } else {
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5799 dc= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5800 start_i = 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5801 qmat = s->q_inter_matrix[qscale];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5802 length = s->inter_ac_vlc_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5803 last_length= s->inter_ac_vlc_last_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5804 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5805 last_non_zero = s->block_last_index[n];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5806
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5807 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5808 {START_TIMER
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5809 #endif
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
5810 dc += (1<<(RECON_SHIFT-1));
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
5811 for(i=0; i<64; i++){
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
5812 rem[i]= dc - (orig[i]<<RECON_SHIFT); //FIXME use orig dirrectly insteadof copying to rem[]
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5813 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5814 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5815 STOP_TIMER("memset rem[]")}
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5816 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5817 sum=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5818 for(i=0; i<64; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5819 int one= 36;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5820 int qns=4;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5821 int w;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5822
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5823 w= ABS(weight[i]) + qns*one;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5824 w= 15 + (48*qns*one + w/2)/w; // 16 .. 63
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5825
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5826 weight[i] = w;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5827 // w=weight[i] = (63*qns + (w/2)) / w;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5828
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5829 assert(w>0);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5830 assert(w<(1<<6));
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5831 sum += w*w;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5832 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5833 lambda= sum*(uint64_t)s->lambda2 >> (FF_LAMBDA_SHIFT - 6 + 6 + 6 + 6);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5834 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5835 {START_TIMER
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5836 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5837 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5838 rle_index=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5839 for(i=start_i; i<=last_non_zero; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5840 int j= perm_scantable[i];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5841 const int level= block[j];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5842 int coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5843
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5844 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5845 if(level<0) coeff= qmul*level - qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5846 else coeff= qmul*level + qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5847 run_tab[rle_index++]=run;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5848 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5849
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
5850 s->dsp.add_8x8basis(rem, basis[j], coeff);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5851 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5852 run++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5853 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5854 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5855 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5856 if(last_non_zero>0){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5857 STOP_TIMER("init rem[]")
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5858 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5859 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5860
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5861 {START_TIMER
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5862 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5863 for(;;){
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
5864 int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5865 int best_coeff=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5866 int best_change=0;
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
5867 int run2, best_unquant_change=0, analyze_gradient;
1785
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5868 #ifdef REFINE_STATS
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5869 {START_TIMER
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5870 #endif
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5871 analyze_gradient = last_non_zero > 2 || s->avctx->quantizer_noise_shaping >= 3;
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5872
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5873 if(analyze_gradient){
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5874 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5875 {START_TIMER
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5876 #endif
1785
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5877 for(i=0; i<64; i++){
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5878 int w= weight[i];
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5879
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5880 d1[i] = (rem[i]*w*w + (1<<(RECON_SHIFT+12-1)))>>(RECON_SHIFT+12);
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5881 }
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5882 #ifdef REFINE_STATS
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5883 STOP_TIMER("rem*w*w")}
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5884 {START_TIMER
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5885 #endif
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5886 s->dsp.fdct(d1);
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5887 #ifdef REFINE_STATS
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5888 STOP_TIMER("dct")}
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5889 #endif
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5890 }
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5891
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5892 if(start_i){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5893 const int level= block[0];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5894 int change, old_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5895
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5896 assert(s->mb_intra);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5897
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5898 old_coeff= q*level;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5899
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5900 for(change=-1; change<=1; change+=2){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5901 int new_level= level + change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5902 int score, new_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5903
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5904 new_coeff= q*new_level;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5905 if(new_coeff >= 2048 || new_coeff < 0)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5906 continue;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5907
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
5908 score= s->dsp.try_8x8basis(rem, weight, basis[0], new_coeff - old_coeff);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5909 if(score<best_score){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5910 best_score= score;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5911 best_coeff= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5912 best_change= change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5913 best_unquant_change= new_coeff - old_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5914 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5915 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5916 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5917
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5918 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5919 rle_index=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5920 run2= run_tab[rle_index++];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5921 prev_level=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5922 prev_run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5923
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5924 for(i=start_i; i<64; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5925 int j= perm_scantable[i];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5926 const int level= block[j];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5927 int change, old_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5928
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5929 if(s->avctx->quantizer_noise_shaping < 3 && i > last_non_zero + 1)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5930 break;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5931
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5932 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5933 if(level<0) old_coeff= qmul*level - qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5934 else old_coeff= qmul*level + qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5935 run2= run_tab[rle_index++]; //FIXME ! maybe after last
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5936 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5937 old_coeff=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5938 run2--;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5939 assert(run2>=0 || i >= last_non_zero );
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5940 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5941
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5942 for(change=-1; change<=1; change+=2){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5943 int new_level= level + change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5944 int score, new_coeff, unquant_change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5945
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5946 score=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5947 if(s->avctx->quantizer_noise_shaping < 2 && ABS(new_level) > ABS(level))
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5948 continue;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5949
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5950 if(new_level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5951 if(new_level<0) new_coeff= qmul*new_level - qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5952 else new_coeff= qmul*new_level + qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5953 if(new_coeff >= 2048 || new_coeff <= -2048)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5954 continue;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5955 //FIXME check for overflow
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5956
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5957 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5958 if(level < 63 && level > -63){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5959 if(i < last_non_zero)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5960 score += length[UNI_AC_ENC_INDEX(run, new_level+64)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5961 - length[UNI_AC_ENC_INDEX(run, level+64)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5962 else
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5963 score += last_length[UNI_AC_ENC_INDEX(run, new_level+64)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5964 - last_length[UNI_AC_ENC_INDEX(run, level+64)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5965 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5966 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5967 assert(ABS(new_level)==1);
1785
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5968
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5969 if(analyze_gradient){
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5970 int g= d1[ scantable[i] ];
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5971 if(g && (g^new_level) >= 0)
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5972 continue;
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5973 }
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
5974
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5975 if(i < last_non_zero){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5976 int next_i= i + run2 + 1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5977 int next_level= block[ perm_scantable[next_i] ] + 64;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5978
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5979 if(next_level&(~127))
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5980 next_level= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5981
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5982 if(next_i < last_non_zero)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5983 score += length[UNI_AC_ENC_INDEX(run, 65)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5984 + length[UNI_AC_ENC_INDEX(run2, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5985 - length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5986 else
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5987 score += length[UNI_AC_ENC_INDEX(run, 65)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5988 + last_length[UNI_AC_ENC_INDEX(run2, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5989 - last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5990 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5991 score += last_length[UNI_AC_ENC_INDEX(run, 65)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5992 if(prev_level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5993 score += length[UNI_AC_ENC_INDEX(prev_run, prev_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5994 - last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5995 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5996 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5997 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5998 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5999 new_coeff=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6000 assert(ABS(level)==1);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6001
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6002 if(i < last_non_zero){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6003 int next_i= i + run2 + 1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6004 int next_level= block[ perm_scantable[next_i] ] + 64;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6005
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6006 if(next_level&(~127))
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6007 next_level= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6008
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6009 if(next_i < last_non_zero)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6010 score += length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6011 - length[UNI_AC_ENC_INDEX(run2, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6012 - length[UNI_AC_ENC_INDEX(run, 65)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6013 else
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6014 score += last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6015 - last_length[UNI_AC_ENC_INDEX(run2, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6016 - length[UNI_AC_ENC_INDEX(run, 65)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6017 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6018 score += -last_length[UNI_AC_ENC_INDEX(run, 65)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6019 if(prev_level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6020 score += last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6021 - length[UNI_AC_ENC_INDEX(prev_run, prev_level)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6022 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6023 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6024 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6025
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6026 score *= lambda;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6027
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6028 unquant_change= new_coeff - old_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6029 assert((score < 100*lambda && score > -100*lambda) || lambda==0);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6030
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6031 score+= s->dsp.try_8x8basis(rem, weight, basis[j], unquant_change);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6032 if(score<best_score){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6033 best_score= score;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6034 best_coeff= i;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6035 best_change= change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6036 best_unquant_change= unquant_change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6037 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6038 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6039 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6040 prev_level= level + 64;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6041 if(prev_level&(~127))
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6042 prev_level= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6043 prev_run= run;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6044 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6045 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6046 run++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6047 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6048 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6049 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6050 STOP_TIMER("iterative step")}
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6051 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6052
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6053 if(best_change){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6054 int j= perm_scantable[ best_coeff ];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6055
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6056 block[j] += best_change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6057
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6058 if(best_coeff > last_non_zero){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6059 last_non_zero= best_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6060 assert(block[j]);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6061 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6062 after_last++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6063 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6064 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6065 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6066 if(block[j]){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6067 if(block[j] - best_change){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6068 if(ABS(block[j]) > ABS(block[j] - best_change)){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6069 raise++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6070 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6071 lower++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6072 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6073 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6074 from_zero++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6075 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6076 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6077 to_zero++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6078 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6079 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6080 for(; last_non_zero>=start_i; last_non_zero--){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6081 if(block[perm_scantable[last_non_zero]])
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6082 break;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6083 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6084 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6085 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6086 count++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6087 if(256*256*256*64 % count == 0){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6088 printf("after_last:%d to_zero:%d from_zero:%d raise:%d lower:%d sign:%d xyp:%d/%d/%d\n", after_last, to_zero, from_zero, raise, lower, messed_sign, s->mb_x, s->mb_y, s->picture_number);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6089 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6090 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6091 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6092 rle_index=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6093 for(i=start_i; i<=last_non_zero; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6094 int j= perm_scantable[i];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6095 const int level= block[j];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6096
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6097 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6098 run_tab[rle_index++]=run;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6099 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6100 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6101 run++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6102 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6103 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6104
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6105 s->dsp.add_8x8basis(rem, basis[j], best_unquant_change);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6106 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6107 break;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6108 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6109 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6110 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6111 if(last_non_zero>0){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6112 STOP_TIMER("iterative search")
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6113 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6114 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6115 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6116
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6117 return last_non_zero;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6118 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6119
220
0b234715e205 (commit by michael)
arpi_esp
parents: 217
diff changeset
6120 static int dct_quantize_c(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6121 DCTELEM *block, int n,
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6122 int qscale, int *overflow)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6123 {
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6124 int i, j, level, last_non_zero, q, start_i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6125 const int *qmat;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
6126 const uint8_t *scantable= s->intra_scantable.scantable;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6127 int bias;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6128 int max=0;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6129 unsigned int threshold1, threshold2;
828
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
6130
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
6131 s->dsp.fdct (block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6132
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
6133 if(s->dct_error_sum)
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
6134 s->denoise_dct(s, block);
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
6135
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6136 if (s->mb_intra) {
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6137 if (!s->h263_aic) {
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6138 if (n < 4)
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6139 q = s->y_dc_scale;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6140 else
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6141 q = s->c_dc_scale;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6142 q = q << 3;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6143 } else
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6144 /* 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
6145 q = 1 << 3;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6146
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6147 /* note: block[0] is assumed to be positive */
986e461dc072 Initial revision
glantau
parents:
diff changeset
6148 block[0] = (block[0] + (q >> 1)) / q;
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6149 start_i = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6150 last_non_zero = 0;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6151 qmat = s->q_intra_matrix[qscale];
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6152 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6153 } else {
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6154 start_i = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6155 last_non_zero = -1;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6156 qmat = s->q_inter_matrix[qscale];
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6157 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6158 }
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6159 threshold1= (1<<QMAT_SHIFT) - bias - 1;
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6160 threshold2= (threshold1<<1);
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6161 for(i=63;i>=start_i;i--) {
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
6162 j = scantable[i];
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6163 level = block[j] * qmat[j];
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6164
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6165 if(((unsigned)(level+threshold1))>threshold2){
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6166 last_non_zero = i;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6167 break;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6168 }else{
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6169 block[j]=0;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6170 }
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6171 }
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6172 for(i=start_i; i<=last_non_zero; i++) {
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6173 j = scantable[i];
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6174 level = block[j] * qmat[j];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6175
1215
9182f5e70e9b typo in a comment ...
michaelni
parents: 1214
diff changeset
6176 // if( bias+level >= (1<<QMAT_SHIFT)
9182f5e70e9b typo in a comment ...
michaelni
parents: 1214
diff changeset
6177 // || bias-level >= (1<<QMAT_SHIFT)){
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6178 if(((unsigned)(level+threshold1))>threshold2){
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6179 if(level>0){
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6180 level= (bias + level)>>QMAT_SHIFT;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6181 block[j]= level;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6182 }else{
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6183 level= (bias - level)>>QMAT_SHIFT;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6184 block[j]= -level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6185 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6186 max |=level;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6187 }else{
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6188 block[j]=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6189 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
6190 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6191 *overflow= s->max_qcoeff < max; //overflow might have happend
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6192
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
6193 /* 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
6194 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM)
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
6195 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero);
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
6196
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6197 return last_non_zero;
986e461dc072 Initial revision
glantau
parents:
diff changeset
6198 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
6199
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
6200 #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
6201
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6202 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
6203 DCTELEM *block, int n, int qscale)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6204 {
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
6205 int i, level, nCoeffs;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
6206 const uint16_t *quant_matrix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6207
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6208 nCoeffs= s->block_last_index[n];
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
6209
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6210 if (n < 4)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6211 block[0] = block[0] * s->y_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6212 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6213 block[0] = block[0] * s->c_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6214 /* XXX: only mpeg1 */
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6215 quant_matrix = s->intra_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6216 for(i=1;i<=nCoeffs;i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6217 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6218 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6219 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6220 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6221 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6222 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6223 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6224 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6225 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6226 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6227 level = (level - 1) | 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6228 }
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6229 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6230 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
6231 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
6232 }
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
6233
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6234 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6235 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6236 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6237 int i, level, nCoeffs;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6238 const uint16_t *quant_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6239
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6240 nCoeffs= s->block_last_index[n];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6241
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6242 quant_matrix = s->inter_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6243 for(i=0; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6244 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6245 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6246 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6247 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6248 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6249 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6250 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6251 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6252 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6253 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6254 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6255 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6256 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6257 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6258 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6259 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6260 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6261 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6262
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6263 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6264 DCTELEM *block, int n, int qscale)
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6265 {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6266 int i, level, nCoeffs;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
6267 const uint16_t *quant_matrix;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6268
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6269 if(s->alternate_scan) nCoeffs= 63;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6270 else nCoeffs= s->block_last_index[n];
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6271
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6272 if (n < 4)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6273 block[0] = block[0] * s->y_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6274 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6275 block[0] = block[0] * s->c_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6276 quant_matrix = s->intra_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6277 for(i=1;i<=nCoeffs;i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6278 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6279 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6280 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6281 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6282 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6283 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6284 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6285 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6286 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6287 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6288 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6289 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6290 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6291 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6292
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6293 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6294 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6295 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6296 int i, level, nCoeffs;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6297 const uint16_t *quant_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6298 int sum=-1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6299
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6300 if(s->alternate_scan) nCoeffs= 63;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6301 else nCoeffs= s->block_last_index[n];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6302
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6303 quant_matrix = s->inter_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6304 for(i=0; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6305 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6306 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6307 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6308 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6309 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6310 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6311 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6312 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6313 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6314 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6315 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6316 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6317 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6318 sum+=level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6319 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6320 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6321 block[63]^=sum&1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6322 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6323
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6324 static void dct_unquantize_h263_intra_c(MpegEncContext *s,
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6325 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6326 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6327 int i, level, qmul, qadd;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6328 int nCoeffs;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6329
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6330 assert(s->block_last_index[n]>=0);
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6331
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6332 qmul = qscale << 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6333
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6334 if (!s->h263_aic) {
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6335 if (n < 4)
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6336 block[0] = block[0] * s->y_dc_scale;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6337 else
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6338 block[0] = block[0] * s->c_dc_scale;
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6339 qadd = (qscale - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6340 }else{
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6341 qadd = 0;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6342 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6343 if(s->ac_pred)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6344 nCoeffs=63;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6345 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6346 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6347
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6348 for(i=1; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6349 level = block[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6350 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6351 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6352 level = level * qmul - qadd;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6353 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6354 level = level * qmul + qadd;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6355 }
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6356 block[i] = level;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6357 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6358 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6359 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6360
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6361 static void dct_unquantize_h263_inter_c(MpegEncContext *s,
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
6362 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
6363 {
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
6364 int i, level, qmul, qadd;
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
6365 int nCoeffs;
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
6366
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6367 assert(s->block_last_index[n]>=0);
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6368
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6369 qadd = (qscale - 1) | 1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6370 qmul = qscale << 1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6371
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6372 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6373
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6374 for(i=0; i<=nCoeffs; i++) {
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
6375 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
6376 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
6377 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
6378 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
6379 } 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
6380 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
6381 }
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
6382 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
6383 }
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
6384 }
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
6385 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6386
1059
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6387 static const AVOption mpeg4_options[] =
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6388 {
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6389 AVOPTION_CODEC_INT("bitrate", "desired video bitrate", bit_rate, 4, 240000000, 800000),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6390 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
6391 "the reference can be CBR (for CBR pass1) or VBR (for pass2)",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6392 bit_rate_tolerance, 4, 240000000, 8000),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6393 AVOPTION_CODEC_INT("qmin", "minimum quantizer", qmin, 1, 31, 2),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6394 AVOPTION_CODEC_INT("qmax", "maximum quantizer", qmax, 1, 31, 31),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6395 AVOPTION_CODEC_STRING("rc_eq", "rate control equation",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6396 rc_eq, "tex^qComp,option1,options2", 0),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6397 AVOPTION_CODEC_INT("rc_minrate", "rate control minimum bitrate",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6398 rc_min_rate, 4, 24000000, 0),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6399 AVOPTION_CODEC_INT("rc_maxrate", "rate control maximum bitrate",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6400 rc_max_rate, 4, 24000000, 0),
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6401 AVOPTION_CODEC_DOUBLE("rc_buf_aggresivity", "rate control buffer aggresivity",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6402 rc_buffer_aggressivity, 4, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6403 AVOPTION_CODEC_DOUBLE("rc_initial_cplx", "initial complexity for pass1 ratecontrol",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6404 rc_initial_cplx, 0., 9999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6405 AVOPTION_CODEC_DOUBLE("i_quant_factor", "qscale factor between p and i frames",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6406 i_quant_factor, 0., 0., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6407 AVOPTION_CODEC_DOUBLE("i_quant_offset", "qscale offset between p and i frames",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6408 i_quant_factor, -999999., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6409 AVOPTION_CODEC_INT("dct_algo", "dct alghorithm",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6410 dct_algo, 0, 5, 0), // fixme - "Auto,FastInt,Int,MMX,MLib,Altivec"
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6411 AVOPTION_CODEC_DOUBLE("lumi_masking", "luminance masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6412 lumi_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6413 AVOPTION_CODEC_DOUBLE("temporal_cplx_masking", "temporary complexity masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6414 temporal_cplx_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6415 AVOPTION_CODEC_DOUBLE("spatial_cplx_masking", "spatial complexity masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6416 spatial_cplx_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6417 AVOPTION_CODEC_DOUBLE("p_masking", "p block masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6418 p_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6419 AVOPTION_CODEC_DOUBLE("dark_masking", "darkness masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6420 dark_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6421 AVOPTION_CODEC_INT("idct_algo", "idct alghorithm",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6422 idct_algo, 0, 8, 0), // fixme - "Auto,Int,Simple,SimpleMMX,LibMPEG2MMX,PS2,MLib,ARM,Altivec"
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6423
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6424 AVOPTION_CODEC_INT("mb_qmin", "minimum MB quantizer",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6425 mb_qmin, 0, 8, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6426 AVOPTION_CODEC_INT("mb_qmax", "maximum MB quantizer",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6427 mb_qmin, 0, 8, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6428
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6429 AVOPTION_CODEC_INT("me_cmp", "ME compare function",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6430 me_cmp, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6431 AVOPTION_CODEC_INT("me_sub_cmp", "subpixel ME compare function",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6432 me_sub_cmp, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6433
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6434
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6435 AVOPTION_CODEC_INT("dia_size", "ME diamond size & shape",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6436 dia_size, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6437 AVOPTION_CODEC_INT("last_predictor_count", "amount of previous MV predictors",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6438 last_predictor_count, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6439
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6440 AVOPTION_CODEC_INT("pre_me", "pre pass for ME",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6441 pre_me, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6442 AVOPTION_CODEC_INT("me_pre_cmp", "ME pre pass compare function",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6443 me_pre_cmp, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6444
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6445 AVOPTION_CODEC_INT("me_range", "maximum ME search range",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6446 me_range, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6447 AVOPTION_CODEC_INT("pre_dia_size", "ME pre pass diamod size & shape",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6448 pre_dia_size, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6449 AVOPTION_CODEC_INT("me_subpel_quality", "subpel ME quality",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6450 me_subpel_quality, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6451 AVOPTION_CODEC_INT("me_range", "maximum ME search range",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6452 me_range, 0, 24000000, 0),
1059
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6453 AVOPTION_CODEC_FLAG("psnr", "calculate PSNR of compressed frames",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6454 flags, CODEC_FLAG_PSNR, 0),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6455 AVOPTION_CODEC_RCOVERRIDE("rc_override", "ratecontrol override (=startframe,endframe,qscale,quality_factor)",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6456 rc_override),
1124
64c7c76ed17c * 'externaly' visible option list begins avoptions_ prefix
kabi
parents: 1116
diff changeset
6457 AVOPTION_SUB(avoptions_common),
1059
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6458 AVOPTION_END()
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6459 };
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6460
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
6461 #ifdef CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6462 AVCodec h263_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
6463 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
6464 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6465 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6466 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6467 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6468 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6469 MPV_encode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6470 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
6471
986e461dc072 Initial revision
glantau
parents:
diff changeset
6472 AVCodec h263p_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
6473 "h263p",
986e461dc072 Initial revision
glantau
parents:
diff changeset
6474 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6475 CODEC_ID_H263P,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6476 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6477 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6478 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6479 MPV_encode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6480 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
6481
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6482 AVCodec flv_encoder = {
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6483 "flv",
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6484 CODEC_TYPE_VIDEO,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6485 CODEC_ID_FLV1,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6486 sizeof(MpegEncContext),
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6487 MPV_encode_init,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6488 MPV_encode_picture,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6489 MPV_encode_end,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6490 };
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6491
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6492 AVCodec rv10_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
6493 "rv10",
986e461dc072 Initial revision
glantau
parents:
diff changeset
6494 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6495 CODEC_ID_RV10,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6496 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6497 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6498 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6499 MPV_encode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6500 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
6501
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6502 AVCodec rv20_encoder = {
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6503 "rv20",
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6504 CODEC_TYPE_VIDEO,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6505 CODEC_ID_RV20,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6506 sizeof(MpegEncContext),
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6507 MPV_encode_init,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6508 MPV_encode_picture,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6509 MPV_encode_end,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6510 };
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6511
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
6512 AVCodec mpeg4_encoder = {
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
6513 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6514 CODEC_TYPE_VIDEO,
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
6515 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6516 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6517 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6518 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6519 MPV_encode_end,
1059
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
6520 .options = mpeg4_options,
2111
3c1dba53954e 10l (fixes delayed frames during encoding)
michael
parents: 2074
diff changeset
6521 .capabilities= CODEC_CAP_DELAY,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6522 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
6523
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6524 AVCodec msmpeg4v1_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6525 "msmpeg4v1",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6526 CODEC_TYPE_VIDEO,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6527 CODEC_ID_MSMPEG4V1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6528 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6529 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6530 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6531 MPV_encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6532 .options = mpeg4_options,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6533 };
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6534
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6535 AVCodec msmpeg4v2_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6536 "msmpeg4v2",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6537 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6538 CODEC_ID_MSMPEG4V2,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6539 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6540 MPV_encode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6541 MPV_encode_picture,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6542 MPV_encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6543 .options = mpeg4_options,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6544 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6545
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6546 AVCodec msmpeg4v3_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6547 "msmpeg4",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6548 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6549 CODEC_ID_MSMPEG4V3,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6550 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6551 MPV_encode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6552 MPV_encode_picture,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6553 MPV_encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6554 .options = mpeg4_options,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6555 };
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6556
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6557 AVCodec wmv1_encoder = {
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6558 "wmv1",
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6559 CODEC_TYPE_VIDEO,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6560 CODEC_ID_WMV1,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6561 sizeof(MpegEncContext),
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6562 MPV_encode_init,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6563 MPV_encode_picture,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6564 MPV_encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
6565 .options = mpeg4_options,
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6566 };
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6567
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6568 AVCodec mjpeg_encoder = {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6569 "mjpeg",
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6570 CODEC_TYPE_VIDEO,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6571 CODEC_ID_MJPEG,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6572 sizeof(MpegEncContext),
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6573 MPV_encode_init,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6574 MPV_encode_picture,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6575 MPV_encode_end,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6576 };
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
6577
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
6578 #endif //CONFIG_ENCODERS