annotate mpegvideo.c @ 10894:4b2227257766 libavcodec

Support lowres 3 when decoding MPEG video. Patch by Anatoliy Nenashev, nenashev_as mail ru
author cehoyos
date Sat, 16 Jan 2010 10:41:52 +0000
parents a47f207fe4b5
children ea8f891d997d
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!)
8629
04423b2f6e0b cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 8596
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 *
5214
470601203f44 Group all copyright and author notices together.
diego
parents: 5213
diff changeset
6 * 4MV & hq & B-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at>
470601203f44 Group all copyright and author notices together.
diego
parents: 5213
diff changeset
7 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3939
diff changeset
8 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3939
diff changeset
9 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3939
diff changeset
10 * FFmpeg is free software; you can redistribute it and/or
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
11 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
12 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3939
diff changeset
13 * version 2.1 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3939
diff changeset
15 * FFmpeg is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
18 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
19 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
20 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3939
diff changeset
21 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3011
diff changeset
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
23 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
24
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
25 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8629
diff changeset
26 * @file libavcodec/mpegvideo.c
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
27 * The simplest mpeg encoder (well, it was the simplest!).
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
28 */
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
29
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
30 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
31 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
32 #include "mpegvideo.h"
5204
1c3baf4323bb Description: split mpegvideo.c
benoit
parents: 5175
diff changeset
33 #include "mpegvideo_common.h"
5028
3d8a813666e4 split ljpeg encoder out of mjpeg.c
aurel
parents: 5005
diff changeset
34 #include "mjpegenc.h"
4967
6d45158e0249 disable reference to msmpeg4 and wmv2 code when those codecs are not compiled in
aurel
parents: 4668
diff changeset
35 #include "msmpeg4.h"
1557
5d53c03186a1 floating point AAN DCT
michael
parents: 1556
diff changeset
36 #include "faandct.h"
8881
f8042554d4c8 Add xvmc_internal.h that contains all internal xvmc function declarations.
diego
parents: 8859
diff changeset
37 #include "xvmc_internal.h"
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
38 #include <limits.h>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
39
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
40 //#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
41 //#include <assert.h>
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
42
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
43 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
44 DCTELEM *block, int n, int qscale);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
45 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
46 DCTELEM *block, int n, int qscale);
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
47 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
48 DCTELEM *block, int n, int qscale);
3281
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
49 static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s,
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
50 DCTELEM *block, int n, int qscale);
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
51 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
52 DCTELEM *block, int n, int qscale);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
53 static void dct_unquantize_h263_intra_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
54 DCTELEM *block, int n, int qscale);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
55 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
56 DCTELEM *block, int n, int qscale);
206
994aa8623443 (commit by michael)
arpi_esp
parents: 200
diff changeset
57
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
58
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 /* enable all paranoid tests for rounding, overflows, etc... */
986e461dc072 Initial revision
glantau
parents:
diff changeset
60 //#define PARANOID
986e461dc072 Initial revision
glantau
parents:
diff changeset
61
986e461dc072 Initial revision
glantau
parents:
diff changeset
62 //#define DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
63
321
2b00e171b1d4 - ME method compatibility with legacy apps.
pulento
parents: 320
diff changeset
64
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
65 static const uint8_t ff_default_chroma_qscale_table[32]={
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
66 // 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
67 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
68 };
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
69
6459
588d15844c80 move ff_mpeg1_dc_scale_table to mpegvideo.c
aurel
parents: 6445
diff changeset
70 const uint8_t ff_mpeg1_dc_scale_table[128]={
588d15844c80 move ff_mpeg1_dc_scale_table to mpegvideo.c
aurel
parents: 6445
diff changeset
71 // 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
588d15844c80 move ff_mpeg1_dc_scale_table to mpegvideo.c
aurel
parents: 6445
diff changeset
72 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
588d15844c80 move ff_mpeg1_dc_scale_table to mpegvideo.c
aurel
parents: 6445
diff changeset
73 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
588d15844c80 move ff_mpeg1_dc_scale_table to mpegvideo.c
aurel
parents: 6445
diff changeset
74 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
588d15844c80 move ff_mpeg1_dc_scale_table to mpegvideo.c
aurel
parents: 6445
diff changeset
75 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
588d15844c80 move ff_mpeg1_dc_scale_table to mpegvideo.c
aurel
parents: 6445
diff changeset
76 };
588d15844c80 move ff_mpeg1_dc_scale_table to mpegvideo.c
aurel
parents: 6445
diff changeset
77
9028
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9011
diff changeset
78 const enum PixelFormat ff_pixfmt_list_420[] = {
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9011
diff changeset
79 PIX_FMT_YUV420P,
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9011
diff changeset
80 PIX_FMT_NONE
0f95e4f0a3f5 Add and use ff_pixfmt_list_420.
michael
parents: 9011
diff changeset
81 };
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
82
9060
f49b1c1d2c16 Add ff_hwaccel_pixfmt_list_420[] definition.
benoit
parents: 9028
diff changeset
83 const enum PixelFormat ff_hwaccel_pixfmt_list_420[] = {
9332
b5c30624da37 Add VA API pixfmt (only VLD is available ATM).
gb
parents: 9200
diff changeset
84 PIX_FMT_VAAPI_VLD,
9060
f49b1c1d2c16 Add ff_hwaccel_pixfmt_list_420[] definition.
benoit
parents: 9028
diff changeset
85 PIX_FMT_YUV420P,
f49b1c1d2c16 Add ff_hwaccel_pixfmt_list_420[] definition.
benoit
parents: 9028
diff changeset
86 PIX_FMT_NONE
f49b1c1d2c16 Add ff_hwaccel_pixfmt_list_420[] definition.
benoit
parents: 9028
diff changeset
87 };
f49b1c1d2c16 Add ff_hwaccel_pixfmt_list_420[] definition.
benoit
parents: 9028
diff changeset
88
3086
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
89 const uint8_t *ff_find_start_code(const uint8_t * restrict p, const uint8_t *end, uint32_t * restrict state){
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
90 int i;
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
91
3092
421579792fc2 1 goto 1 fix
michael
parents: 3089
diff changeset
92 assert(p<=end);
421579792fc2 1 goto 1 fix
michael
parents: 3089
diff changeset
93 if(p>=end)
421579792fc2 1 goto 1 fix
michael
parents: 3089
diff changeset
94 return end;
421579792fc2 1 goto 1 fix
michael
parents: 3089
diff changeset
95
3086
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
96 for(i=0; i<3; i++){
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
97 uint32_t tmp= *state << 8;
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
98 *state= tmp + *(p++);
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
99 if(tmp == 0x100 || p==end)
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
100 return p;
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
101 }
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
102
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
103 while(p<end){
3087
526bc949ef31 simplify
michael
parents: 3086
diff changeset
104 if (p[-1] > 1 ) p+= 3;
526bc949ef31 simplify
michael
parents: 3086
diff changeset
105 else if(p[-2] ) p+= 2;
526bc949ef31 simplify
michael
parents: 3086
diff changeset
106 else if(p[-3]|(p[-1]-1)) p++;
3086
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
107 else{
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
108 p++;
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
109 break;
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
110 }
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
111 }
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
112
3087
526bc949ef31 simplify
michael
parents: 3086
diff changeset
113 p= FFMIN(p, end)-4;
5424
07844149dfa9 replacing the use of deprecated unaligned*() routines by LD64 and AV_RB32
romansh
parents: 5286
diff changeset
114 *state= AV_RB32(p);
3086
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
115
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
116 return p+4;
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
117 }
befacb1cb573 faster find_startcode()
michael
parents: 3070
diff changeset
118
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
119 /* init common dct for both encoder and decoder */
9007
043574c5c153 Add missing av_cold in static init/close functions.
stefano
parents: 9003
diff changeset
120 av_cold int ff_dct_common_init(MpegEncContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
121 {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
122 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
123 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
124 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
125 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
126 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c;
3281
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
127 if(s->flags & CODEC_FLAG_BITEXACT)
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
128 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact;
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
129 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
130
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
131 #if 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
132 MPV_common_init_mmx(s);
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
133 #elif ARCH_ALPHA
514
c9f724e3a797 Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents: 506
diff changeset
134 MPV_common_init_axp(s);
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
135 #elif CONFIG_MLIB
628
f596db4aa871 sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents: 625
diff changeset
136 MPV_common_init_mlib(s);
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
137 #elif HAVE_MMI
721
71f669e9f633 ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents: 717
diff changeset
138 MPV_common_init_mmi(s);
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
139 #elif ARCH_ARM
8359
9281a8a9387a ARM: replace "armv4l" with "arm"
mru
parents: 8342
diff changeset
140 MPV_common_init_arm(s);
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
141 #elif HAVE_ALTIVEC
5761
72b59f7613af Rename MPV_common_init_ppc to MPV_common_init_altivec, the function is
diego
parents: 5760
diff changeset
142 MPV_common_init_altivec(s);
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
143 #elif ARCH_BFIN
5132
a3b82ca01e68 integrating MPV_common_init_bfin into the build system and mpegvideo.c
mhoffman
parents: 5129
diff changeset
144 MPV_common_init_bfin(s);
a3b82ca01e68 integrating MPV_common_init_bfin into the build system and mpegvideo.c
mhoffman
parents: 5129
diff changeset
145 #endif
730
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
146
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
147 /* load & permutate scantables
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
148 note: only wmv uses different ones
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
149 */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
150 if(s->alternate_scan){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
151 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
152 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
153 }else{
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
154 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
155 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
156 }
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
157 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
158 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
159
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
160 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
161 }
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
162
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7922
diff changeset
163 void ff_copy_picture(Picture *dst, Picture *src){
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
164 *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
165 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
166 }
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
167
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
168 /**
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
169 * Releases a frame buffer
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
170 */
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
171 static void free_frame_buffer(MpegEncContext *s, Picture *pic)
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
172 {
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
173 s->avctx->release_buffer(s->avctx, (AVFrame*)pic);
9200
7b62de9c383d Rename hwaccel_data_private to hwaccel_picture_private.
gb
parents: 9161
diff changeset
174 av_freep(&pic->hwaccel_picture_private);
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
175 }
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
176
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
177 /**
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
178 * Allocates a frame buffer
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
179 */
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
180 static int alloc_frame_buffer(MpegEncContext *s, Picture *pic)
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
181 {
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
182 int r;
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
183
9155
9e66ada64b76 Add private HW accel data infrastructure.
gb
parents: 9124
diff changeset
184 if (s->avctx->hwaccel) {
9200
7b62de9c383d Rename hwaccel_data_private to hwaccel_picture_private.
gb
parents: 9161
diff changeset
185 assert(!pic->hwaccel_picture_private);
9155
9e66ada64b76 Add private HW accel data infrastructure.
gb
parents: 9124
diff changeset
186 if (s->avctx->hwaccel->priv_data_size) {
9200
7b62de9c383d Rename hwaccel_data_private to hwaccel_picture_private.
gb
parents: 9161
diff changeset
187 pic->hwaccel_picture_private = av_mallocz(s->avctx->hwaccel->priv_data_size);
7b62de9c383d Rename hwaccel_data_private to hwaccel_picture_private.
gb
parents: 9161
diff changeset
188 if (!pic->hwaccel_picture_private) {
9155
9e66ada64b76 Add private HW accel data infrastructure.
gb
parents: 9124
diff changeset
189 av_log(s->avctx, AV_LOG_ERROR, "alloc_frame_buffer() failed (hwaccel private data allocation)\n");
9e66ada64b76 Add private HW accel data infrastructure.
gb
parents: 9124
diff changeset
190 return -1;
9e66ada64b76 Add private HW accel data infrastructure.
gb
parents: 9124
diff changeset
191 }
9e66ada64b76 Add private HW accel data infrastructure.
gb
parents: 9124
diff changeset
192 }
9e66ada64b76 Add private HW accel data infrastructure.
gb
parents: 9124
diff changeset
193 }
9e66ada64b76 Add private HW accel data infrastructure.
gb
parents: 9124
diff changeset
194
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
195 r = s->avctx->get_buffer(s->avctx, (AVFrame*)pic);
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
196
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
197 if (r<0 || !pic->age || !pic->type || !pic->data[0]) {
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
198 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n", r, pic->age, pic->type, pic->data[0]);
9200
7b62de9c383d Rename hwaccel_data_private to hwaccel_picture_private.
gb
parents: 9161
diff changeset
199 av_freep(&pic->hwaccel_picture_private);
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
200 return -1;
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
201 }
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
202
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
203 if (s->linesize && (s->linesize != pic->linesize[0] || s->uvlinesize != pic->linesize[1])) {
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
204 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (stride changed)\n");
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
205 free_frame_buffer(s, pic);
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
206 return -1;
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
207 }
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
208
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
209 if (pic->linesize[1] != pic->linesize[2]) {
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
210 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (uv stride mismatch)\n");
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
211 free_frame_buffer(s, pic);
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
212 return -1;
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
213 }
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
214
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
215 return 0;
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
216 }
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
217
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
218 /**
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
219 * allocates a Picture
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
220 * The pixels are allocated/set by calling get_buffer() if shared=0
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
221 */
9721
5d0f71ba8648 Rename alloc_picture to ff_alloc_picture and move its definition
bcoudurier
parents: 9644
diff changeset
222 int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared){
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5077
diff changeset
223 const int big_mb_num= s->mb_stride*(s->mb_height+1) + 1; //the +1 is needed so memset(,,stride*height) does not sig11
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
224 const int mb_array_size= s->mb_stride*s->mb_height;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
225 const int b8_array_size= s->b8_stride*s->mb_height*2;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
226 const int b4_array_size= s->b4_stride*s->mb_height*4;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
227 int i;
5427
5a61305cc568 fix mem leak
benoit
parents: 5424
diff changeset
228 int r= -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
229
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
230 if(shared){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
231 assert(pic->data[0]);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
232 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
233 pic->type= FF_BUFFER_TYPE_SHARED;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
234 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
235 assert(!pic->data[0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
236
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
237 if (alloc_frame_buffer(s, pic) < 0)
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
238 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
239
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
240 s->linesize = pic->linesize[0];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
241 s->uvlinesize= pic->linesize[1];
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
242 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
243
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
244 if(pic->qscale_table==NULL){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
245 if (s->encoding) {
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
246 FF_ALLOCZ_OR_GOTO(s->avctx, pic->mb_var , mb_array_size * sizeof(int16_t) , fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
247 FF_ALLOCZ_OR_GOTO(s->avctx, pic->mc_mb_var, mb_array_size * sizeof(int16_t) , fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
248 FF_ALLOCZ_OR_GOTO(s->avctx, pic->mb_mean , mb_array_size * sizeof(int8_t ) , fail)
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
249 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
250
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
251 FF_ALLOCZ_OR_GOTO(s->avctx, pic->mbskip_table , mb_array_size * sizeof(uint8_t)+2, fail) //the +2 is for the slice end check
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
252 FF_ALLOCZ_OR_GOTO(s->avctx, pic->qscale_table , mb_array_size * sizeof(uint8_t) , fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
253 FF_ALLOCZ_OR_GOTO(s->avctx, pic->mb_type_base , (big_mb_num + s->mb_stride) * sizeof(uint32_t), fail)
5955
bd9a68cc9a17 fix segfault with interlaced h.264
michael
parents: 5850
diff changeset
254 pic->mb_type= pic->mb_type_base + 2*s->mb_stride+1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
255 if(s->out_format == FMT_H264){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
256 for(i=0; i<2; i++){
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
257 FF_ALLOCZ_OR_GOTO(s->avctx, pic->motion_val_base[i], 2 * (b4_array_size+4) * sizeof(int16_t), fail)
2570
682c57163e60 alignment fix
michael
parents: 2552
diff changeset
258 pic->motion_val[i]= pic->motion_val_base[i]+4;
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
259 FF_ALLOCZ_OR_GOTO(s->avctx, pic->ref_index[i], b8_array_size * sizeof(uint8_t), fail)
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
260 }
1669
072666f04bca motion_subsample_log2
michael
parents: 1668
diff changeset
261 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
262 }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
263 for(i=0; i<2; i++){
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
264 FF_ALLOCZ_OR_GOTO(s->avctx, pic->motion_val_base[i], 2 * (b8_array_size+4) * sizeof(int16_t), fail)
2570
682c57163e60 alignment fix
michael
parents: 2552
diff changeset
265 pic->motion_val[i]= pic->motion_val_base[i]+4;
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
266 FF_ALLOCZ_OR_GOTO(s->avctx, pic->ref_index[i], b8_array_size * sizeof(uint8_t), fail)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
267 }
1669
072666f04bca motion_subsample_log2
michael
parents: 1668
diff changeset
268 pic->motion_subsample_log2= 3;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
269 }
1833
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
270 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) {
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
271 FF_ALLOCZ_OR_GOTO(s->avctx, pic->dct_coeff, 64 * mb_array_size * sizeof(DCTELEM)*6, fail)
1833
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
272 }
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
273 pic->qstride= s->mb_stride;
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
274 FF_ALLOCZ_OR_GOTO(s->avctx, pic->pan_scan , 1 * sizeof(AVPanScan), fail)
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
275 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
276
5129
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
277 /* It might be nicer if the application would keep track of these
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
278 * but it would require an API change. */
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
279 memmove(s->prev_pict_types+1, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE-1);
6867
8f656b589911 Fix MB skipping with droppable frames.
michael
parents: 6658
diff changeset
280 s->prev_pict_types[0]= s->dropable ? FF_B_TYPE : s->pict_type;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
281 if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == FF_B_TYPE)
5129
0244bba24b43 misc typo fixes
diego
parents: 5127
diff changeset
282 pic->age= INT_MAX; // Skipped MBs in B-frames are quite rare in MPEG-1/2 and it is a bit tricky to skip them anyway.
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
283
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
284 return 0;
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
285 fail: //for the FF_ALLOCZ_OR_GOTO macro
5427
5a61305cc568 fix mem leak
benoit
parents: 5424
diff changeset
286 if(r>=0)
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
287 free_frame_buffer(s, pic);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
288 return -1;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
289 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
290
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
291 /**
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
292 * deallocates a picture
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
293 */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
294 static void free_picture(MpegEncContext *s, Picture *pic){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
295 int i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
296
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
297 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
298 free_frame_buffer(s, pic);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
299 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
300
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
301 av_freep(&pic->mb_var);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
302 av_freep(&pic->mc_mb_var);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
303 av_freep(&pic->mb_mean);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
304 av_freep(&pic->mbskip_table);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
305 av_freep(&pic->qscale_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
306 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
307 av_freep(&pic->dct_coeff);
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1542
diff changeset
308 av_freep(&pic->pan_scan);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
309 pic->mb_type= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
310 for(i=0; i<2; i++){
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
311 av_freep(&pic->motion_val_base[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
312 av_freep(&pic->ref_index[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
313 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
314
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
315 if(pic->type == FF_BUFFER_TYPE_SHARED){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
316 for(i=0; i<4; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
317 pic->base[i]=
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
318 pic->data[i]= NULL;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
319 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
320 pic->type= 0;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
321 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
322 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
323
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
324 static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
325 int i;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
326
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
327 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264)
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
328 FF_ALLOCZ_OR_GOTO(s->avctx, s->allocated_edge_emu_buffer, (s->width+64)*2*21*2, fail); //(width + edge + align)*interlaced*MBsize*tolerance
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3309
diff changeset
329 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*21;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
330
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5077
diff changeset
331 //FIXME should be linesize instead of s->width*2 but that is not known before get_buffer()
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
332 FF_ALLOCZ_OR_GOTO(s->avctx, s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t), fail)
8239
dcfdb3352dde Fix regression test failure with pthreads on multiprocessor systems.
michael
parents: 7974
diff changeset
333 s->me.temp= s->me.scratchpad;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
334 s->rd_scratchpad= s->me.scratchpad;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
335 s->b_scratchpad= s->me.scratchpad;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
336 s->obmc_scratchpad= s->me.scratchpad + 16;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
337 if (s->encoding) {
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
338 FF_ALLOCZ_OR_GOTO(s->avctx, s->me.map , ME_MAP_SIZE*sizeof(uint32_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
339 FF_ALLOCZ_OR_GOTO(s->avctx, s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t), fail)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
340 if(s->avctx->noise_reduction){
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
341 FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_error_sum, 2 * 64 * sizeof(int), fail)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
342 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
343 }
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
344 FF_ALLOCZ_OR_GOTO(s->avctx, s->blocks, 64*12*2 * sizeof(DCTELEM), fail)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
345 s->block= s->blocks[0];
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
346
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
347 for(i=0;i<12;i++){
9003
b595a8a59967 Change the type of pblocks from pointers to short array into
iive
parents: 8982
diff changeset
348 s->pblocks[i] = &s->block[i];
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
349 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
350 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
351 fail:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
352 return -1; //free() through MPV_common_end()
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
353 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
354
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
355 static void free_duplicate_context(MpegEncContext *s){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
356 if(s==NULL) return;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
357
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
358 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
359 av_freep(&s->me.scratchpad);
8239
dcfdb3352dde Fix regression test failure with pthreads on multiprocessor systems.
michael
parents: 7974
diff changeset
360 s->me.temp=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
361 s->rd_scratchpad=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
362 s->b_scratchpad=
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
363 s->obmc_scratchpad= NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
364
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
365 av_freep(&s->dct_error_sum);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
366 av_freep(&s->me.map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
367 av_freep(&s->me.score_map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
368 av_freep(&s->blocks);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
369 s->block= NULL;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
370 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
371
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
372 static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
373 #define COPY(a) bak->a= src->a
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
374 COPY(allocated_edge_emu_buffer);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
375 COPY(edge_emu_buffer);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
376 COPY(me.scratchpad);
8239
dcfdb3352dde Fix regression test failure with pthreads on multiprocessor systems.
michael
parents: 7974
diff changeset
377 COPY(me.temp);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
378 COPY(rd_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
379 COPY(b_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
380 COPY(obmc_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
381 COPY(me.map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
382 COPY(me.score_map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
383 COPY(blocks);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
384 COPY(block);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
385 COPY(start_mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
386 COPY(end_mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
387 COPY(me.map_generation);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
388 COPY(pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
389 COPY(dct_error_sum);
1810
fc6b38b5dd40 noise reduction with threads bugfix
michael
parents: 1805
diff changeset
390 COPY(dct_count[0]);
fc6b38b5dd40 noise reduction with threads bugfix
michael
parents: 1805
diff changeset
391 COPY(dct_count[1]);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
392 #undef COPY
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
393 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
394
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
395 void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
396 MpegEncContext bak;
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
397 int i;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
398 //FIXME copy only needed parts
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
399 //START_TIMER
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
400 backup_duplicate_context(&bak, dst);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
401 memcpy(dst, src, sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
402 backup_duplicate_context(dst, &bak);
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
403 for(i=0;i<12;i++){
9003
b595a8a59967 Change the type of pblocks from pointers to short array into
iive
parents: 8982
diff changeset
404 dst->pblocks[i] = &dst->block[i];
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
405 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
406 //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
407 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
408
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
409 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
410 * sets the given MpegEncContext to common defaults (same for encoding and decoding).
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
411 * the changed fields will not depend upon the prior state of the MpegEncContext.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
412 */
5204
1c3baf4323bb Description: split mpegvideo.c
benoit
parents: 5175
diff changeset
413 void MPV_common_defaults(MpegEncContext *s){
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
414 s->y_dc_scale_table=
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
415 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
416 s->chroma_qscale_table= ff_default_chroma_qscale_table;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
417 s->progressive_frame= 1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
418 s->progressive_sequence= 1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
419 s->picture_structure= PICT_FRAME;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
420
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
421 s->coded_picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
422 s->picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
423 s->input_picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
424
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
425 s->picture_in_gop_number = 0;
1894
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
426
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
427 s->f_code = 1;
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
428 s->b_code = 1;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
429 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
430
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
431 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
432 * sets the given MpegEncContext to defaults for decoding.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
433 * the changed fields will not depend upon the prior state of the MpegEncContext.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
434 */
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
435 void MPV_decode_defaults(MpegEncContext *s){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
436 MPV_common_defaults(s);
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
437 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
438
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
439 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
440 * init common structure for both encoder and decoder.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
441 * this assumes that some variables like width/height are already set
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
442 */
9007
043574c5c153 Add missing av_cold in static init/close functions.
stefano
parents: 9003
diff changeset
443 av_cold int MPV_common_init(MpegEncContext *s)
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
444 {
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5623
diff changeset
445 int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y, threads;
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
446
9362
fc417197fe11 Fix mb_height for interlaced mpeg2.
michael
parents: 9332
diff changeset
447 if(s->codec_id == CODEC_ID_MPEG2VIDEO && !s->progressive_sequence)
fc417197fe11 Fix mb_height for interlaced mpeg2.
michael
parents: 9332
diff changeset
448 s->mb_height = (s->height + 31) / 32 * 2;
fc417197fe11 Fix mb_height for interlaced mpeg2.
michael
parents: 9332
diff changeset
449 else
9426
638187aad3aa fix indentation
bcoudurier
parents: 9362
diff changeset
450 s->mb_height = (s->height + 15) / 16;
3070
3c32ecc8eefe fix crash on height < 16 pixels.
lorenm
parents: 3069
diff changeset
451
8982
a24c04956930 Exit with error if MPV_common_init() is called with PIX_FMT_NONE.
iive
parents: 8949
diff changeset
452 if(s->avctx->pix_fmt == PIX_FMT_NONE){
a24c04956930 Exit with error if MPV_common_init() is called with PIX_FMT_NONE.
iive
parents: 8949
diff changeset
453 av_log(s->avctx, AV_LOG_ERROR, "decoding to PIX_FMT_NONE is not supported.\n");
a24c04956930 Exit with error if MPV_common_init() is called with PIX_FMT_NONE.
iive
parents: 8949
diff changeset
454 return -1;
a24c04956930 Exit with error if MPV_common_init() is called with PIX_FMT_NONE.
iive
parents: 8949
diff changeset
455 }
a24c04956930 Exit with error if MPV_common_init() is called with PIX_FMT_NONE.
iive
parents: 8949
diff changeset
456
3070
3c32ecc8eefe fix crash on height < 16 pixels.
lorenm
parents: 3069
diff changeset
457 if(s->avctx->thread_count > MAX_THREADS || (s->avctx->thread_count > s->mb_height && s->mb_height)){
1989
michael
parents: 1988
diff changeset
458 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
michael
parents: 1988
diff changeset
459 return -1;
michael
parents: 1988
diff changeset
460 }
michael
parents: 1988
diff changeset
461
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
462 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
463 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
464
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
465 dsputil_init(&s->dsp, s->avctx);
5788
a3a2968e16ad export DCT_common_init and add ff_prefix
bcoudurier
parents: 5761
diff changeset
466 ff_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
467
754
b2767c9d6455 init flags before using it (found by arpi)
michaelni
parents: 753
diff changeset
468 s->flags= s->avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
469 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
470
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
471 s->mb_width = (s->width + 15) / 16;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
472 s->mb_stride = s->mb_width + 1;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
473 s->b8_stride = s->mb_width*2 + 1;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
474 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
475 mb_array_size= s->mb_height * s->mb_stride;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
476 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
477
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
478 /* set chroma shifts */
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
479 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
480 &(s->chroma_y_shift) );
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
481
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
482 /* 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
483 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
484 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
485
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
486 s->mb_num = s->mb_width * s->mb_height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
487
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
488 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
489 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
490 s->block_wrap[2]=
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
491 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
492 s->block_wrap[4]=
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
493 s->block_wrap[5]= s->mb_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
494
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
495 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
496 c_size = s->mb_stride * (s->mb_height + 1);
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
497 yc_size = y_size + 2 * c_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
498
701
85b071dfc7e3 ff_get_fourcc() & XVIX support
michaelni
parents: 697
diff changeset
499 /* convert fourcc to upper case */
4155
0f28fc219799 add codec_tag and codec_stream_tag to MpegEncContext to not alter avctx values
bcoudurier
parents: 4122
diff changeset
500 s->codec_tag= toupper( s->avctx->codec_tag &0xFF)
1116
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
501 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 )
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
502 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16)
1116
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
503 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24);
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
504
4155
0f28fc219799 add codec_tag and codec_stream_tag to MpegEncContext to not alter avctx values
bcoudurier
parents: 4122
diff changeset
505 s->stream_codec_tag= toupper( s->avctx->stream_codec_tag &0xFF)
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
506 + (toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 )
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
507 + (toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16)
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
508 + (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
509
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
510 s->avctx->coded_frame= (AVFrame*)&s->current_picture;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
511
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
512 FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_index2xy, (s->mb_num+1)*sizeof(int), fail) //error ressilience code looks cleaner with 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
513 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
514 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
515 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
516 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
517 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
518 s->mb_index2xy[ s->mb_height*s->mb_width ] = (s->mb_height-1)*s->mb_stride + s->mb_width; //FIXME really needed?
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
519
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
520 if (s->encoding) {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
521 /* Allocate MV tables */
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
522 FF_ALLOCZ_OR_GOTO(s->avctx, s->p_mv_table_base , mv_table_size * 2 * sizeof(int16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
523 FF_ALLOCZ_OR_GOTO(s->avctx, s->b_forw_mv_table_base , mv_table_size * 2 * sizeof(int16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
524 FF_ALLOCZ_OR_GOTO(s->avctx, s->b_back_mv_table_base , mv_table_size * 2 * sizeof(int16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
525 FF_ALLOCZ_OR_GOTO(s->avctx, s->b_bidir_forw_mv_table_base , mv_table_size * 2 * sizeof(int16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
526 FF_ALLOCZ_OR_GOTO(s->avctx, s->b_bidir_back_mv_table_base , mv_table_size * 2 * sizeof(int16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
527 FF_ALLOCZ_OR_GOTO(s->avctx, s->b_direct_mv_table_base , mv_table_size * 2 * sizeof(int16_t), fail)
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
528 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
529 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
530 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
531 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
532 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
533 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
534
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
535 if(s->msmpeg4_version){
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
536 FF_ALLOCZ_OR_GOTO(s->avctx, s->ac_stats, 2*2*(MAX_LEVEL+1)*(MAX_RUN+1)*2*sizeof(int), fail);
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
537 }
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
538 FF_ALLOCZ_OR_GOTO(s->avctx, s->avctx->stats_out, 256, fail);
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
539
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
540 /* Allocate MB type table */
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
541 FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_type , mb_array_size * sizeof(uint16_t), fail) //needed for encoding
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
542
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
543 FF_ALLOCZ_OR_GOTO(s->avctx, s->lambda_table, mb_array_size * sizeof(int), fail)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
544
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
545 FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix , 64*32 * sizeof(int), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
546 FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix , 64*32 * sizeof(int), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
547 FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix16, 64*32*2 * sizeof(uint16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
548 FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
549 FF_ALLOCZ_OR_GOTO(s->avctx, s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
550 FF_ALLOCZ_OR_GOTO(s->avctx, s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*), fail)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
551
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
552 if(s->avctx->noise_reduction){
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
553 FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_offset, 2 * 64 * sizeof(uint16_t), fail)
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
554 }
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
555 }
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
556 FF_ALLOCZ_OR_GOTO(s->avctx, s->picture, MAX_PICTURE_COUNT * sizeof(Picture), fail)
9828
6487152f17f2 Properly initialize AVFrames to default values in the MPEG decoder (fixes
lucabe
parents: 9721
diff changeset
557 for(i = 0; i < MAX_PICTURE_COUNT; i++) {
6487152f17f2 Properly initialize AVFrames to default values in the MPEG decoder (fixes
lucabe
parents: 9721
diff changeset
558 avcodec_get_frame_defaults((AVFrame *)&s->picture[i]);
6487152f17f2 Properly initialize AVFrames to default values in the MPEG decoder (fixes
lucabe
parents: 9721
diff changeset
559 }
1552
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
560
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
561 FF_ALLOCZ_OR_GOTO(s->avctx, s->error_status_table, mb_array_size*sizeof(uint8_t), fail)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
562
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
563 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
564 /* interlaced direct mode decoding tables */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
565 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
566 int j, k;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
567 for(j=0; j<2; j++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
568 for(k=0; k<2; k++){
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
569 FF_ALLOCZ_OR_GOTO(s->avctx, s->b_field_mv_table_base[i][j][k], mv_table_size * 2 * sizeof(int16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
570 s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
571 }
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
572 FF_ALLOCZ_OR_GOTO(s->avctx, s->b_field_select_table [i][j], mb_array_size * 2 * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
573 FF_ALLOCZ_OR_GOTO(s->avctx, s->p_field_mv_table_base[i][j], mv_table_size * 2 * sizeof(int16_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
574 s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j]+ s->mb_stride + 1;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
575 }
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
576 FF_ALLOCZ_OR_GOTO(s->avctx, s->p_field_select_table[i], mb_array_size * 2 * sizeof(uint8_t), fail)
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
577 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
578 }
767
c75c3f1bef4b regression test for H263+
michaelni
parents: 766
diff changeset
579 if (s->out_format == FMT_H263) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
580 /* ac values */
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
581 FF_ALLOCZ_OR_GOTO(s->avctx, s->ac_val_base, yc_size * sizeof(int16_t) * 16, fail);
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
582 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
583 s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
584 s->ac_val[2] = s->ac_val[1] + c_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
585
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
586 /* cbp values */
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
587 FF_ALLOCZ_OR_GOTO(s->avctx, s->coded_block_base, y_size, fail);
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
588 s->coded_block= s->coded_block_base + s->b8_stride + 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
589
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
590 /* cbp, ac_pred, pred_dir */
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
591 FF_ALLOCZ_OR_GOTO(s->avctx, s->cbp_table , mb_array_size * sizeof(uint8_t), fail)
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
592 FF_ALLOCZ_OR_GOTO(s->avctx, s->pred_dir_table, mb_array_size * sizeof(uint8_t), fail)
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
593 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
594
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
595 if (s->h263_pred || s->h263_plus || !s->encoding) {
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
596 /* dc values */
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
597 //MN: we need these for error resilience of intra-frames
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
598 FF_ALLOCZ_OR_GOTO(s->avctx, s->dc_val_base, yc_size * sizeof(int16_t), fail);
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
599 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
600 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
601 s->dc_val[2] = s->dc_val[1] + c_size;
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
602 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
603 s->dc_val_base[i] = 1024;
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
604 }
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
605
611
3214d3f4519e error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents: 608
diff changeset
606 /* which mb is a intra block */
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
607 FF_ALLOCZ_OR_GOTO(s->avctx, s->mbintra_table, mb_array_size, fail);
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
608 memset(s->mbintra_table, 1, mb_array_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
609
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
610 /* init macroblock skip table */
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
611 FF_ALLOCZ_OR_GOTO(s->avctx, s->mbskip_table, mb_array_size+2, fail);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
612 //Note the +1 is for a quicker mpeg4 slice_end detection
10137
9a670cfd1941 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
ramiro
parents: 9828
diff changeset
613 FF_ALLOCZ_OR_GOTO(s->avctx, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE, fail);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
614
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 828
diff changeset
615 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
616 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
617 s->visualization_buffer[0] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH);
7456
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
618 s->visualization_buffer[1] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH);
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
619 s->visualization_buffer[2] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
620 }
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 828
diff changeset
621
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
622 s->context_initialized = 1;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
623
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
624 s->thread_context[0]= s;
6193
52ccab2531bd Fix memory leak in h264 decoder. allocated_edge_emu_buffer was being allocated
heydowns
parents: 5955
diff changeset
625 threads = s->avctx->thread_count;
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5623
diff changeset
626
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5623
diff changeset
627 for(i=1; i<threads; i++){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
628 s->thread_context[i]= av_malloc(sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
629 memcpy(s->thread_context[i], s, sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
630 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
631
5642
d2598034f2a9 Add slice-based parallel H.264 decoding
gpoirier
parents: 5623
diff changeset
632 for(i=0; i<threads; i++){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
633 if(init_duplicate_context(s->thread_context[i], s) < 0)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
634 goto fail;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
635 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
636 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
637 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
638
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
639 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
640 fail:
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
641 MPV_common_end(s);
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
642 return -1;
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
643 }
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
644
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
645 /* init common structure for both encoder and decoder */
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
646 void MPV_common_end(MpegEncContext *s)
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
647 {
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
648 int i, j, k;
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
649
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
650 for(i=0; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
651 free_duplicate_context(s->thread_context[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
652 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
653 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
654 av_freep(&s->thread_context[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
655 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
656
1344
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
657 av_freep(&s->parse_context.buffer);
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
658 s->parse_context.buffer_size=0;
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
659
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
660 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
661 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
662 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
663 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
664 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
665 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
666 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
667 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
668 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
669 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
670 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
671 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
672 s->b_direct_mv_table= NULL;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
673 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
674 for(j=0; j<2; j++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
675 for(k=0; k<2; k++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
676 av_freep(&s->b_field_mv_table_base[i][j][k]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
677 s->b_field_mv_table[i][j][k]=NULL;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
678 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
679 av_freep(&s->b_field_select_table[i][j]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
680 av_freep(&s->p_field_mv_table_base[i][j]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
681 s->p_field_mv_table[i][j]=NULL;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
682 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
683 av_freep(&s->p_field_select_table[i]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
684 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
685
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
686 av_freep(&s->dc_val_base);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
687 av_freep(&s->ac_val_base);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
688 av_freep(&s->coded_block_base);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
689 av_freep(&s->mbintra_table);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
690 av_freep(&s->cbp_table);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
691 av_freep(&s->pred_dir_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
692
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
693 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
694 av_freep(&s->prev_pict_types);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
695 av_freep(&s->bitstream_buffer);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
696 s->allocated_bitstream_buffer_size=0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
697
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
698 av_freep(&s->avctx->stats_out);
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
699 av_freep(&s->ac_stats);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
700 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
701 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
702 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
703 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
704 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
705 av_freep(&s->q_intra_matrix16);
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
706 av_freep(&s->q_inter_matrix16);
1556
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
707 av_freep(&s->input_picture);
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
708 av_freep(&s->reordered_input_picture);
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
709 av_freep(&s->dct_offset);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
710
1573
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
711 if(s->picture){
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
712 for(i=0; i<MAX_PICTURE_COUNT; i++){
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
713 free_picture(s, &s->picture[i]);
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
714 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
715 }
1552
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
716 av_freep(&s->picture);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
717 s->context_initialized = 0;
1523
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
718 s->last_picture_ptr=
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
719 s->next_picture_ptr=
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
720 s->current_picture_ptr= NULL;
2231
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
721 s->linesize= s->uvlinesize= 0;
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
722
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
723 for(i=0; i<3; i++)
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
724 av_freep(&s->visualization_buffer[i]);
2231
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
725
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
726 avcodec_default_free_buffers(s->avctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
727 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
728
4668
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4658
diff changeset
729 void init_rl(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3])
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
730 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
731 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
732 uint8_t index_run[MAX_RUN+1];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
733 int last, run, level, start, end, i;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
734
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
735 /* If table is static, we can quit if rl->max_level[0] is not NULL */
4668
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4658
diff changeset
736 if(static_store && rl->max_level[0])
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
737 return;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
738
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
739 /* compute max_level[], max_run[] and index_run[] */
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
740 for(last=0;last<2;last++) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
741 if (last == 0) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
742 start = 0;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
743 end = rl->last;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
744 } else {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
745 start = rl->last;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
746 end = rl->n;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
747 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
748
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
749 memset(max_level, 0, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
750 memset(max_run, 0, MAX_LEVEL + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
751 memset(index_run, rl->n, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
752 for(i=start;i<end;i++) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
753 run = rl->table_run[i];
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
754 level = rl->table_level[i];
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
755 if (index_run[run] == rl->n)
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
756 index_run[run] = i;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
757 if (level > max_level[run])
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
758 max_level[run] = level;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
759 if (run > max_run[level])
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
760 max_run[level] = run;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
761 }
4668
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4658
diff changeset
762 if(static_store)
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4658
diff changeset
763 rl->max_level[last] = static_store[last];
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
764 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
765 rl->max_level[last] = av_malloc(MAX_RUN + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
766 memcpy(rl->max_level[last], max_level, MAX_RUN + 1);
4668
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4658
diff changeset
767 if(static_store)
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4658
diff changeset
768 rl->max_run[last] = static_store[last] + MAX_RUN + 1;
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
769 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
770 rl->max_run[last] = av_malloc(MAX_LEVEL + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
771 memcpy(rl->max_run[last], max_run, MAX_LEVEL + 1);
4668
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4658
diff changeset
772 if(static_store)
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4658
diff changeset
773 rl->index_run[last] = static_store[last] + MAX_RUN + MAX_LEVEL + 2;
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
774 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
775 rl->index_run[last] = av_malloc(MAX_RUN + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
776 memcpy(rl->index_run[last], index_run, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
777 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
778 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
779
6940
778ecab25dd8 Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents: 6867
diff changeset
780 void init_vlc_rl(RLTable *rl)
5274
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
781 {
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
782 int i, q;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
783
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
784 for(q=0; q<32; q++){
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
785 int qmul= q*2;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
786 int qadd= (q-1)|1;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
787
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
788 if(q==0){
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
789 qmul=1;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
790 qadd=0;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
791 }
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
792 for(i=0; i<rl->vlc.table_size; i++){
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
793 int code= rl->vlc.table[i][0];
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
794 int len = rl->vlc.table[i][1];
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
795 int level, run;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
796
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
797 if(len==0){ // illegal code
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
798 run= 66;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
799 level= MAX_LEVEL;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
800 }else if(len<0){ //more bits needed
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
801 run= 0;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
802 level= code;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
803 }else{
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
804 if(code==rl->n){ //esc
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
805 run= 66;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
806 level= 0;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
807 }else{
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
808 run= rl->table_run [code] + 1;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
809 level= rl->table_level[code] * qmul + qadd;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
810 if(code >= rl->last) run+=192;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
811 }
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
812 }
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
813 rl->rl_vlc[q][i].len= len;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
814 rl->rl_vlc[q][i].level= level;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
815 rl->rl_vlc[q][i].run= run;
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
816 }
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
817 }
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
818 }
c6bc608d2659 move init_vlc_rl from h263.c to mpegvideo.c
aurel
parents: 5265
diff changeset
819
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
820 int ff_find_unused_picture(MpegEncContext *s, int shared){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
821 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
822
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
823 if(shared){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
824 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
825 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) return i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
826 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
827 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
828 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
829 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) return i; //FIXME
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
830 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
831 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
832 if(s->picture[i].data[0]==NULL) return i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
833 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
834 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
835
5836
0859108b4ae3 replace (disabled by default) assert(0) by abort() if the picture buffer
michael
parents: 5798
diff changeset
836 av_log(s->avctx, AV_LOG_FATAL, "Internal error, picture buffer overflow\n");
5850
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
837 /* We could return -1, but the codec would crash trying to draw into a
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
838 * non-existing frame anyway. This is safer than waiting for a random crash.
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
839 * Also the return of this is never useful, an encoder must only allocate
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
840 * as much as allowed in the specification. This has no relationship to how
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
841 * much libavcodec could allocate (and MAX_PICTURE_COUNT is always large
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
842 * enough for such valid streams).
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
843 * Plus, a decoder has to check stream validity and remove frames if too
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
844 * many reference frames are around. Waiting for "OOM" is not correct at
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
845 * all. Similarly, missing reference frames have to be replaced by
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
846 * interpolated/MC frames, anything else is a bug in the codec ...
da358b2602ce Clarify comment block and rewrite in better English.
diego
parents: 5836
diff changeset
847 */
5836
0859108b4ae3 replace (disabled by default) assert(0) by abort() if the picture buffer
michael
parents: 5798
diff changeset
848 abort();
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
849 return -1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
850 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
851
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
852 static void update_noise_reduction(MpegEncContext *s){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
853 int intra, i;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
854
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
855 for(intra=0; intra<2; intra++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
856 if(s->dct_count[intra] > (1<<16)){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
857 for(i=0; i<64; i++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
858 s->dct_error_sum[intra][i] >>=1;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
859 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
860 s->dct_count[intra] >>= 1;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
861 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
862
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
863 for(i=0; i<64; i++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
864 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
865 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
866 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
867 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
868
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
869 /**
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
870 * 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
871 */
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
872 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
873 {
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
874 int i;
9643
5c9d3a72aabf change pic type to Picture* and remove casts
bcoudurier
parents: 9467
diff changeset
875 Picture *pic;
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2627
diff changeset
876 s->mb_skipped = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
877
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1228
diff changeset
878 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
879
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
880 /* mark&release old frames */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
881 if (s->pict_type != FF_B_TYPE && s->last_picture_ptr && s->last_picture_ptr != s->next_picture_ptr && s->last_picture_ptr->data[0]) {
4396
8e78248586b0 set last_picture for h.264 too, this significantly improves error concealment quality, i hope it doesnt break anything as last_picture_ptr was always NULL for h.264
michael
parents: 4346
diff changeset
882 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
883 free_frame_buffer(s, s->last_picture_ptr);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
884
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
885 /* release forgotten pictures */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
886 /* if(mpeg124/h263) */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
887 if(!s->encoding){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
888 for(i=0; i<MAX_PICTURE_COUNT; i++){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
889 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
890 av_log(avctx, AV_LOG_ERROR, "releasing zombie picture\n");
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
891 free_frame_buffer(s, &s->picture[i]);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
892 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
893 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
894 }
4396
8e78248586b0 set last_picture for h.264 too, this significantly improves error concealment quality, i hope it doesnt break anything as last_picture_ptr was always NULL for h.264
michael
parents: 4346
diff changeset
895 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
896 }
10606
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
897
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
898 if(!s->encoding){
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
899 /* release non reference frames */
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
900 for(i=0; i<MAX_PICTURE_COUNT; i++){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
901 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
902 free_frame_buffer(s, &s->picture[i]);
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
903 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
904 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
905
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
906 if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL)
9643
5c9d3a72aabf change pic type to Picture* and remove casts
bcoudurier
parents: 9467
diff changeset
907 pic= s->current_picture_ptr; //we already have a unused image (maybe it was set before reading the header)
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
908 else{
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
909 i= ff_find_unused_picture(s, 0);
9643
5c9d3a72aabf change pic type to Picture* and remove casts
bcoudurier
parents: 9467
diff changeset
910 pic= &s->picture[i];
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
911 }
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
912
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5712
diff changeset
913 pic->reference= 0;
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5712
diff changeset
914 if (!s->dropable){
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5712
diff changeset
915 if (s->codec_id == CODEC_ID_H264)
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5712
diff changeset
916 pic->reference = s->picture_structure;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
917 else if (s->pict_type != FF_B_TYPE)
5723
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5712
diff changeset
918 pic->reference = 3;
49a5d44423ef h264/PAFF preparation: use DELAYED_PIC_REF to mark non-refs frames as held for delayed output
andoma
parents: 5712
diff changeset
919 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
920
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
921 pic->coded_picture_number= s->coded_picture_number++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
922
9721
5d0f71ba8648 Rename alloc_picture to ff_alloc_picture and move its definition
bcoudurier
parents: 9644
diff changeset
923 if(ff_alloc_picture(s, pic, 0) < 0)
1384
18cdce49339e make MPV_frame_start fail on get_buffer failer
iive
parents: 1381
diff changeset
924 return -1;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
925
9643
5c9d3a72aabf change pic type to Picture* and remove casts
bcoudurier
parents: 9467
diff changeset
926 s->current_picture_ptr= pic;
1658
d4637a0eaab1 export top_field_first & interlaced_frame
michael
parents: 1655
diff changeset
927 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
928 s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
929 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
930
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
931 s->current_picture_ptr->pict_type= s->pict_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
932 // if(s->flags && CODEC_FLAG_QSCALE)
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
933 // s->current_picture_ptr->quality= s->new_picture_ptr->quality;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
934 s->current_picture_ptr->key_frame= s->pict_type == FF_I_TYPE;
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
935
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7922
diff changeset
936 ff_copy_picture(&s->current_picture, s->current_picture_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
937
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
938 if (s->pict_type != FF_B_TYPE) {
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
939 s->last_picture_ptr= s->next_picture_ptr;
1944
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
940 if(!s->dropable)
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
941 s->next_picture_ptr= s->current_picture_ptr;
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
942 }
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
943 /* av_log(s->avctx, AV_LOG_DEBUG, "L%p N%p C%p L%p N%p C%p type:%d drop:%d\n", s->last_picture_ptr, s->next_picture_ptr,s->current_picture_ptr,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
944 s->last_picture_ptr ? s->last_picture_ptr->data[0] : NULL,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
945 s->next_picture_ptr ? s->next_picture_ptr->data[0] : NULL,
1944
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
946 s->current_picture_ptr ? s->current_picture_ptr->data[0] : NULL,
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
947 s->pict_type, s->dropable);*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
948
10606
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
949 if(s->codec_id != CODEC_ID_H264){
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
950 if((s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL) && s->pict_type!=FF_I_TYPE){
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
951 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n");
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
952 /* Allocate a dummy frame */
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
953 i= ff_find_unused_picture(s, 0);
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
954 s->last_picture_ptr= &s->picture[i];
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
955 if(ff_alloc_picture(s, s->last_picture_ptr, 0) < 0)
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
956 return -1;
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
957 }
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
958 if((s->next_picture_ptr==NULL || s->next_picture_ptr->data[0]==NULL) && s->pict_type==FF_B_TYPE){
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
959 /* Allocate a dummy frame */
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
960 i= ff_find_unused_picture(s, 0);
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
961 s->next_picture_ptr= &s->picture[i];
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
962 if(ff_alloc_picture(s, s->next_picture_ptr, 0) < 0)
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
963 return -1;
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
964 }
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
965 }
9ea5f2f1874f Move dummy picture allocation code from mpeg1/2 to mpegvideo.
michael
parents: 10604
diff changeset
966
7974
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7922
diff changeset
967 if(s->last_picture_ptr) ff_copy_picture(&s->last_picture, s->last_picture_ptr);
2b20ad98e424 Rename copy_picture to ff_copy_picture.
cehoyos
parents: 7922
diff changeset
968 if(s->next_picture_ptr) ff_copy_picture(&s->next_picture, s->next_picture_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
969
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
970 assert(s->pict_type == FF_I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0]));
1393
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
971
5798
7b058e5183ab Manage Picture buffers for fields as well as frames. Pair complementary fields into one MPV Picture.
andoma
parents: 5788
diff changeset
972 if(s->picture_structure!=PICT_FRAME && s->out_format != FMT_H264){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
973 int i;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
974 for(i=0; i<4; i++){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
975 if(s->picture_structure == PICT_BOTTOM_FIELD){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
976 s->current_picture.data[i] += s->current_picture.linesize[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
977 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
978 s->current_picture.linesize[i] *= 2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
979 s->last_picture.linesize[i] *=2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
980 s->next_picture.linesize[i] *=2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
981 }
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
982 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
983
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
984 s->hurry_up= s->avctx->hurry_up;
7831
8195c970d077 Rename error_resilience to error_recognition.
michael
parents: 7456
diff changeset
985 s->error_recognition= avctx->error_recognition;
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
986
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
987 /* set dequantizer, we can't do it during init as it might change for mpeg4
5127
4dbe6578f811 misc spelling fixes
diego
parents: 5077
diff changeset
988 and we can't do it in the header decode as init is not called for mpeg4 there yet */
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
989 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
990 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
991 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter;
2345
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
992 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
993 s->dct_unquantize_intra = s->dct_unquantize_h263_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
994 s->dct_unquantize_inter = s->dct_unquantize_h263_inter;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
995 }else{
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
996 s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
997 s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
998 }
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
999
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1000 if(s->dct_error_sum){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1001 assert(s->avctx->noise_reduction && s->encoding);
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1002
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1003 update_noise_reduction(s);
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1004 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1005
8948
886ef38c7b36 Get rid of some '#if CONFIG_MPEG_XVMC_DECODER' preprocessor checks around if
diego
parents: 8881
diff changeset
1006 if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration)
8857
9cd28fb52745 Fix compilation: XVMC_ --> ff_xvmc prefix for xvmc functions.
diego
parents: 8855
diff changeset
1007 return ff_xvmc_field_start(s, avctx);
8948
886ef38c7b36 Get rid of some '#if CONFIG_MPEG_XVMC_DECODER' preprocessor checks around if
diego
parents: 8881
diff changeset
1008
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1009 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1010 }
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
1011
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1012 /* generic function for encode/decode called after a frame has been coded/decoded */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1013 void MPV_frame_end(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1014 {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1015 int i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1016 /* draw edge for correct motion prediction if outside */
8949
c6aff37981b6 whitespace cosmetics: Reindent a few lines after the last commit.
diego
parents: 8948
diff changeset
1017 //just to make sure that all data is rendered.
8948
886ef38c7b36 Get rid of some '#if CONFIG_MPEG_XVMC_DECODER' preprocessor checks around if
diego
parents: 8881
diff changeset
1018 if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
8857
9cd28fb52745 Fix compilation: XVMC_ --> ff_xvmc prefix for xvmc functions.
diego
parents: 8855
diff changeset
1019 ff_xvmc_field_end(s);
9011
90c99bda19f5 Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents: 9007
diff changeset
1020 }else if(!s->avctx->hwaccel
90c99bda19f5 Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents: 9007
diff changeset
1021 && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
8522
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8359
diff changeset
1022 && s->unrestricted_mv
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8359
diff changeset
1023 && s->current_picture.reference
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8359
diff changeset
1024 && !s->intra_only
f8c091bb5779 Add VDPAU hardware accelerated decoding for H264 which can be used by
cehoyos
parents: 8359
diff changeset
1025 && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
6437
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6377
diff changeset
1026 s->dsp.draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH );
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6377
diff changeset
1027 s->dsp.draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
5154ab444372 move draw_edges() into dsputil
aurel
parents: 6377
diff changeset
1028 s->dsp.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
1029 }
207
6954f2830e4a (commit by michael)
arpi_esp
parents: 206
diff changeset
1030 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1031
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
1032 s->last_pict_type = s->pict_type;
2997
188f4ef688f2 second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents: 2990
diff changeset
1033 s->last_lambda_for[s->pict_type]= s->current_picture_ptr->quality;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1034 if(s->pict_type!=FF_B_TYPE){
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1035 s->last_non_b_pict_type= s->pict_type;
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1036 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1037 #if 0
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1038 /* copy back current_picture variables */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1039 for(i=0; i<MAX_PICTURE_COUNT; i++){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1040 if(s->picture[i].data[0] == s->current_picture.data[0]){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1041 s->picture[i]= s->current_picture;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1042 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1043 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1044 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1045 assert(i<MAX_PICTURE_COUNT);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1046 #endif
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1047
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1048 if(s->encoding){
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
1049 /* release non-reference frames */
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1050 for(i=0; i<MAX_PICTURE_COUNT; i++){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1051 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
1052 free_frame_buffer(s, &s->picture[i]);
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1053 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1054 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1055 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1056 // clear copies, to avoid confusion
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1057 #if 0
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1058 memset(&s->last_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1059 memset(&s->next_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1060 memset(&s->current_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1061 #endif
2213
c17d0cbbdf66 10l (wrong coded_picture)
michael
parents: 2168
diff changeset
1062 s->avctx->coded_frame= (AVFrame*)s->current_picture_ptr;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1063 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1064
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
1065 /**
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1066 * draws an line from (ex, ey) -> (sx, sy).
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1067 * @param w width of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1068 * @param h height of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1069 * @param stride stride/linesize of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1070 * @param color color of the arrow
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1071 */
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1072 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
3595
michael
parents: 3589
diff changeset
1073 int x, y, fr, f;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1074
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4525
diff changeset
1075 sx= av_clip(sx, 0, w-1);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4525
diff changeset
1076 sy= av_clip(sy, 0, h-1);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4525
diff changeset
1077 ex= av_clip(ex, 0, w-1);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4525
diff changeset
1078 ey= av_clip(ey, 0, h-1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1079
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1080 buf[sy*stride + sx]+= color;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1081
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1082 if(FFABS(ex - sx) > FFABS(ey - sy)){
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1083 if(sx > ex){
4120
8fe20344c9b5 Rename SWAP macro to FFSWAP.
diego
parents: 4111
diff changeset
1084 FFSWAP(int, sx, ex);
8fe20344c9b5 Rename SWAP macro to FFSWAP.
diego
parents: 4111
diff changeset
1085 FFSWAP(int, sy, ey);
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1086 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1087 buf+= sx + sy*stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1088 ex-= sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1089 f= ((ey-sy)<<16)/ex;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1090 for(x= 0; x <= ex; x++){
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1091 y = (x*f)>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1092 fr= (x*f)&0xFFFF;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1093 buf[ y *stride + x]+= (color*(0x10000-fr))>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1094 buf[(y+1)*stride + x]+= (color* fr )>>16;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1095 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1096 }else{
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1097 if(sy > ey){
4120
8fe20344c9b5 Rename SWAP macro to FFSWAP.
diego
parents: 4111
diff changeset
1098 FFSWAP(int, sx, ex);
8fe20344c9b5 Rename SWAP macro to FFSWAP.
diego
parents: 4111
diff changeset
1099 FFSWAP(int, sy, ey);
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1100 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1101 buf+= sx + sy*stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1102 ey-= sy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1103 if(ey) f= ((ex-sx)<<16)/ey;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1104 else f= 0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1105 for(y= 0; y <= ey; y++){
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1106 x = (y*f)>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1107 fr= (y*f)&0xFFFF;
6377
michael
parents: 6342
diff changeset
1108 buf[y*stride + x ]+= (color*(0x10000-fr))>>16;
michael
parents: 6342
diff changeset
1109 buf[y*stride + x+1]+= (color* fr )>>16;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1110 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1111 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1112 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1113
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1114 /**
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1115 * draws an arrow from (ex, ey) -> (sx, sy).
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1116 * @param w width of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1117 * @param h height of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1118 * @param stride stride/linesize of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1119 * @param color color of the arrow
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1120 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1121 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1122 int dx,dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1123
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4525
diff changeset
1124 sx= av_clip(sx, -100, w+100);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4525
diff changeset
1125 sy= av_clip(sy, -100, h+100);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4525
diff changeset
1126 ex= av_clip(ex, -100, w+100);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4525
diff changeset
1127 ey= av_clip(ey, -100, h+100);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1128
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1129 dx= ex - sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1130 dy= ey - sy;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1131
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1132 if(dx*dx + dy*dy > 3*3){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1133 int rx= dx + dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1134 int ry= -dx + dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1135 int length= ff_sqrt((rx*rx + ry*ry)<<8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1136
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1137 //FIXME subpixel accuracy
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1138 rx= ROUNDED_DIV(rx*3<<4, length);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1139 ry= ROUNDED_DIV(ry*3<<4, length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1140
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1141 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
1142 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
1143 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1144 draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1145 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1146
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1147 /**
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
1148 * 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
1149 */
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1150 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
1151
9089
bea68afbf199 Merge three conditions in a single 'if' instead of two.
benoit
parents: 9068
diff changeset
1152 if(s->avctx->hwaccel || !pict || !pict->mb_type) return;
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
1153
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1154 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
1155 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1156
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1157 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
1158 switch (pict->pict_type) {
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1159 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
1160 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
1161 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
1162 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
1163 case FF_SI_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SI\n"); break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1164 case FF_SP_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SP\n"); break;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1165 }
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
1166 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
1167 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
1168 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
1169 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
1170 if(count>9) count=9;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1171 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
1172 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1173 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
1174 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
1175 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1176 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
1177 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
1178 //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
1179 if(IS_PCM(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1180 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
1181 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
1182 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
1183 else if(IS_INTRA4x4(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1184 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
1185 else if(IS_INTRA16x16(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1186 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
1187 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
1188 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
1189 else if(IS_DIRECT(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1190 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
1191 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
1192 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
1193 else if(IS_GMC(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1194 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
1195 else if(IS_SKIP(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1196 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
1197 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
1198 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
1199 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
1200 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
1201 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
1202 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
1203 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
1204 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1205
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
1206 //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
1207 if(IS_8X8(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1208 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
1209 else if(IS_16X8(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1210 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
1211 else if(IS_8X16(mb_type))
2677
7b7613020f2c remove/replace non-ascii characters
mru
parents: 2668
diff changeset
1212 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
1213 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
1214 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
1215 else
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1216 av_log(s->avctx, AV_LOG_DEBUG, "?");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1217
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1218
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
1219 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
1220 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
1221 else
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1222 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
1223 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1224 // 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
1225 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1226 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
1227 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1228 }
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
1229
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1230 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
1231 const int shift= 1 + s->quarter_sample;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1232 int mb_y;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1233 uint8_t *ptr;
1707
027545a2fdbe 100000l
michael
parents: 1706
diff changeset
1234 int i;
7456
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
1235 int h_chroma_shift, v_chroma_shift, block_height;
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
1236 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
1237 const int height= s->avctx->height;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1238 const int mv_sample_log2= 4 - pict->motion_subsample_log2;
3268
f7a9d8dd476b 10l in h264 vismb/vismv (broke on 2006-03-09)
lorenm
parents: 3245
diff changeset
1239 const int mv_stride= (s->mb_width << mv_sample_log2) + (s->codec_id == CODEC_ID_H264 ? 0 : 1);
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1240 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
1241
1723
033d889d7c2c non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1722
diff changeset
1242 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
1243 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
1244 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
1245 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
1246 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1247 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
1248 ptr= pict->data[0];
7456
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
1249 block_height = 16>>v_chroma_shift;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1250
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1251 for(mb_y=0; mb_y<s->mb_height; mb_y++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1252 int mb_x;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1253 for(mb_x=0; mb_x<s->mb_width; mb_x++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1254 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
1255 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
1256 int type;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1257 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
1258 int direction = 0;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1259 switch (type) {
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1260 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
1261 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1262 direction = 0;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1263 break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1264 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
1265 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1266 direction = 0;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1267 break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1268 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
1269 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1270 direction = 1;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1271 break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1272 }
1712
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1273 if(!USES_LIST(pict->mb_type[mb_index], direction))
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1274 continue;
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1275
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1276 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
1277 int i;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1278 for(i=0; i<4; i++){
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1279 int sx= mb_x*16 + 4 + 8*(i&1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1280 int sy= mb_y*16 + 4 + 8*(i>>1);
2522
e25782262d7d kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2514
diff changeset
1281 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
1282 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
1283 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
1284 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
1285 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1286 }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
1287 int i;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1288 for(i=0; i<2; i++){
1629
74685a0ec851 16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1628
diff changeset
1289 int sx=mb_x*16 + 8;
74685a0ec851 16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1628
diff changeset
1290 int sy=mb_y*16 + 4 + 8*i;
2522
e25782262d7d kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2514
diff changeset
1291 int xy= (mb_x*2 + (mb_y*2 + i)*mv_stride) << (mv_sample_log2-1);
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1292 int mx=(pict->motion_val[direction][xy][0]>>shift);
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1293 int my=(pict->motion_val[direction][xy][1]>>shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1294
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1295 if(IS_INTERLACED(pict->mb_type[mb_index]))
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1296 my*=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1297
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1298 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
1299 }
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1300 }else if(IS_8X16(pict->mb_type[mb_index])){
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1301 int i;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1302 for(i=0; i<2; i++){
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1303 int sx=mb_x*16 + 4 + 8*i;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1304 int sy=mb_y*16 + 8;
2522
e25782262d7d kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2514
diff changeset
1305 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
1306 int mx=(pict->motion_val[direction][xy][0]>>shift);
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1307 int my=(pict->motion_val[direction][xy][1]>>shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1308
1947
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1309 if(IS_INTERLACED(pict->mb_type[mb_index]))
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1310 my*=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1311
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
1312 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
1313 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1314 }else{
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1315 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
1316 int sy= mb_y*16 + 8;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1317 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
1318 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
1319 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
1320 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
1321 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1322 }
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1323 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1324 if((s->avctx->debug&FF_DEBUG_VIS_QP) && pict->motion_val){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1325 uint64_t c= (pict->qscale_table[mb_index]*128/31) * 0x0101010101010101ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1326 int y;
7456
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
1327 for(y=0; y<block_height; y++){
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
1328 *(uint64_t*)(pict->data[1] + 8*mb_x + (block_height*mb_y + y)*pict->linesize[1])= c;
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
1329 *(uint64_t*)(pict->data[2] + 8*mb_x + (block_height*mb_y + y)*pict->linesize[2])= c;
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1330 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1331 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1332 if((s->avctx->debug&FF_DEBUG_VIS_MB_TYPE) && pict->motion_val){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1333 int mb_type= pict->mb_type[mb_index];
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1334 uint64_t u,v;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1335 int y;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1336 #define COLOR(theta, r)\
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1337 u= (int)(128 + r*cos(theta*3.141592/180));\
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1338 v= (int)(128 + r*sin(theta*3.141592/180));
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1339
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1340
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1341 u=v=128;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1342 if(IS_PCM(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1343 COLOR(120,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1344 }else if((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) || IS_INTRA16x16(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1345 COLOR(30,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1346 }else if(IS_INTRA4x4(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1347 COLOR(90,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1348 }else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1349 // COLOR(120,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1350 }else if(IS_DIRECT(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1351 COLOR(150,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1352 }else if(IS_GMC(mb_type) && IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1353 COLOR(170,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1354 }else if(IS_GMC(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1355 COLOR(190,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1356 }else if(IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1357 // COLOR(180,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1358 }else if(!USES_LIST(mb_type, 1)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1359 COLOR(240,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1360 }else if(!USES_LIST(mb_type, 0)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1361 COLOR(0,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1362 }else{
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1363 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1));
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1364 COLOR(300,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1365 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1366
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1367 u*= 0x0101010101010101ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1368 v*= 0x0101010101010101ULL;
7456
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
1369 for(y=0; y<block_height; y++){
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
1370 *(uint64_t*)(pict->data[1] + 8*mb_x + (block_height*mb_y + y)*pict->linesize[1])= u;
211cca1e3f39 fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471
bcoudurier
parents: 7377
diff changeset
1371 *(uint64_t*)(pict->data[2] + 8*mb_x + (block_height*mb_y + y)*pict->linesize[2])= v;
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1372 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1373
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1374 //segmentation
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1375 if(IS_8X8(mb_type) || IS_16X8(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1376 *(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
1377 *(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
1378 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1379 if(IS_8X8(mb_type) || IS_8X16(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1380 for(y=0; y<16; y++)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1381 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
1382 }
2534
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1383 if(IS_8X8(mb_type) && mv_sample_log2 >= 2){
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1384 int dm= 1 << (mv_sample_log2-2);
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1385 for(i=0; i<4; i++){
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1386 int sx= mb_x*16 + 8*(i&1);
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1387 int sy= mb_y*16 + 8*(i>>1);
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1388 int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << (mv_sample_log2-1);
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1389 //FIXME bidir
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1390 int32_t *mv = (int32_t*)&pict->motion_val[0][xy];
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1391 if(mv[0] != mv[dm] || mv[dm*mv_stride] != mv[dm*(mv_stride+1)])
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1392 for(y=0; y<8; y++)
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1393 pict->data[0][sx + 4 + (sy + y)*pict->linesize[0]]^= 0x80;
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1394 if(mv[0] != mv[dm*mv_stride] || mv[dm] != mv[dm*(mv_stride+1)])
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1395 *(uint64_t*)(pict->data[0] + sx + (sy + 4)*pict->linesize[0])^= 0x8080808080808080ULL;
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1396 }
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1397 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1398
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1399 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1400 // hmm
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1401 }
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1402 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1403 s->mbskip_table[mb_index]=0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1404 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1405 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1406 }
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
1407 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1408
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1409 static inline int hpel_motion_lowres(MpegEncContext *s,
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1410 uint8_t *dest, uint8_t *src,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1411 int field_based, int field_select,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1412 int src_x, int src_y,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1413 int width, int height, int stride,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1414 int h_edge_pos, int v_edge_pos,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1415 int w, int h, h264_chroma_mc_func *pix_op,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1416 int motion_x, int motion_y)
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1417 {
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1418 const int lowres= s->avctx->lowres;
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1419 const int op_index= FFMIN(lowres, 2);
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1420 const int s_mask= (2<<lowres)-1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1421 int emu=0;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1422 int sx, sy;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1423
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1424 if(s->quarter_sample){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1425 motion_x/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1426 motion_y/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1427 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1428
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1429 sx= motion_x & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1430 sy= motion_y & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1431 src_x += motion_x >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1432 src_y += motion_y >> (lowres+1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1433
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1434 src += src_y * stride + src_x;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1435
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1436 if( (unsigned)src_x > h_edge_pos - (!!sx) - w
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1437 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1438 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
1439 src_x, src_y<<field_based, h_edge_pos, v_edge_pos);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1440 src= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1441 emu=1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1442 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1443
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1444 sx= (sx << 2) >> lowres;
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1445 sy= (sy << 2) >> lowres;
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1446 if(field_select)
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1447 src += s->linesize;
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1448 pix_op[op_index](dest, src, stride, h, sx, sy);
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1449 return emu;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1450 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1451
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1452 /* apply one mpeg motion vector to the three components */
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4281
diff changeset
1453 static av_always_inline void mpeg_motion_lowres(MpegEncContext *s,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1454 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1455 int field_based, int bottom_field, int field_select,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1456 uint8_t **ref_picture, h264_chroma_mc_func *pix_op,
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1457 int motion_x, int motion_y, int h, int mb_y)
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1458 {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1459 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1460 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
1461 const int lowres= s->avctx->lowres;
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1462 const int op_index= FFMIN(lowres, 2);
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1463 const int block_s= 8>>lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1464 const int s_mask= (2<<lowres)-1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1465 const int h_edge_pos = s->h_edge_pos >> lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1466 const int v_edge_pos = s->v_edge_pos >> lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1467 linesize = s->current_picture.linesize[0] << field_based;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1468 uvlinesize = s->current_picture.linesize[1] << field_based;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1469
7377
3f819263176e cosmetics: Fix two common typos: wont --> will not, lets --> let us.
diego
parents: 6940
diff changeset
1470 if(s->quarter_sample){ //FIXME obviously not perfect but qpel will not work in lowres anyway
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1471 motion_x/=2;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1472 motion_y/=2;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1473 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1474
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1475 if(field_based){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1476 motion_y += (bottom_field - field_select)*((1<<lowres)-1);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1477 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1478
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1479 sx= motion_x & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1480 sy= motion_y & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1481 src_x = s->mb_x*2*block_s + (motion_x >> (lowres+1));
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1482 src_y =( mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1483
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1484 if (s->out_format == FMT_H263) {
2265
c93da911905e lowres chroma fix
michael
parents: 2264
diff changeset
1485 uvsx = ((motion_x>>1) & s_mask) | (sx&1);
c93da911905e lowres chroma fix
michael
parents: 2264
diff changeset
1486 uvsy = ((motion_y>>1) & s_mask) | (sy&1);
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1487 uvsrc_x = src_x>>1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1488 uvsrc_y = src_y>>1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1489 }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
1490 mx = motion_x / 4;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1491 my = motion_y / 4;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1492 uvsx = (2*mx) & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1493 uvsy = (2*my) & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1494 uvsrc_x = s->mb_x*block_s + (mx >> lowres);
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1495 uvsrc_y = mb_y*block_s + (my >> lowres);
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1496 } else {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1497 mx = motion_x / 2;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1498 my = motion_y / 2;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1499 uvsx = mx & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1500 uvsy = my & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1501 uvsrc_x = s->mb_x*block_s + (mx >> (lowres+1));
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1502 uvsrc_y =( mb_y*block_s>>field_based) + (my >> (lowres+1));
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1503 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1504
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1505 ptr_y = ref_picture[0] + src_y * linesize + src_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1506 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1507 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1508
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1509 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1510 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1511 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
1512 src_x, src_y<<field_based, h_edge_pos, v_edge_pos);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1513 ptr_y = s->edge_emu_buffer;
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1514 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1515 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1516 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1517 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1518 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1519 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1520 ptr_cb= uvbuf;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1521 ptr_cr= uvbuf+16;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1522 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1523 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1524
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1525 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
1526 dest_y += s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1527 dest_cb+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1528 dest_cr+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1529 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1530
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1531 if(field_select){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1532 ptr_y += s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1533 ptr_cb+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1534 ptr_cr+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1535 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1536
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1537 sx= (sx << 2) >> lowres;
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1538 sy= (sy << 2) >> lowres;
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1539 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1540
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1541 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1542 uvsx= (uvsx << 2) >> lowres;
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1543 uvsy= (uvsy << 2) >> lowres;
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1544 pix_op[op_index](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1545 pix_op[op_index](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1546 }
2291
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
1547 //FIXME h261 lowres loop filter
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1548 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1549
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1550 static inline void chroma_4mv_motion_lowres(MpegEncContext *s,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1551 uint8_t *dest_cb, uint8_t *dest_cr,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1552 uint8_t **ref_picture,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1553 h264_chroma_mc_func *pix_op,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1554 int mx, int my){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1555 const int lowres= s->avctx->lowres;
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1556 const int op_index= FFMIN(lowres, 2);
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1557 const int block_s= 8>>lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1558 const int s_mask= (2<<lowres)-1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1559 const int h_edge_pos = s->h_edge_pos >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1560 const int v_edge_pos = s->v_edge_pos >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1561 int emu=0, src_x, src_y, offset, sx, sy;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1562 uint8_t *ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1563
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1564 if(s->quarter_sample){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1565 mx/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1566 my/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1567 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1568
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1569 /* In case of 8X8, we construct a single chroma motion vector
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1570 with a special rounding */
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1571 mx= ff_h263_round_chroma(mx);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1572 my= ff_h263_round_chroma(my);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1573
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1574 sx= mx & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1575 sy= my & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1576 src_x = s->mb_x*block_s + (mx >> (lowres+1));
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1577 src_y = s->mb_y*block_s + (my >> (lowres+1));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1578
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1579 offset = src_y * s->uvlinesize + src_x;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1580 ptr = ref_picture[1] + offset;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1581 if(s->flags&CODEC_FLAG_EMU_EDGE){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1582 if( (unsigned)src_x > h_edge_pos - (!!sx) - block_s
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1583 || (unsigned)src_y > v_edge_pos - (!!sy) - block_s){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1584 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
1585 ptr= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1586 emu=1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1587 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1588 }
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1589 sx= (sx << 2) >> lowres;
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1590 sy= (sy << 2) >> lowres;
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1591 pix_op[op_index](dest_cb, ptr, s->uvlinesize, block_s, sx, sy);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1592
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1593 ptr = ref_picture[2] + offset;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1594 if(emu){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1595 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
1596 ptr= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1597 }
10894
4b2227257766 Support lowres 3 when decoding MPEG video.
cehoyos
parents: 10745
diff changeset
1598 pix_op[op_index](dest_cr, ptr, s->uvlinesize, block_s, sx, sy);
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1599 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1600
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1601 /**
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
1602 * motion compensation of a single macroblock
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1603 * @param s context
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1604 * @param dest_y luma destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1605 * @param dest_cb chroma cb/u destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1606 * @param dest_cr chroma cr/v destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1607 * @param dir direction (0->forward, 1->backward)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1608 * @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
1609 * @param pic_op halfpel motion compensation function (average or put normally)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1610 * 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
1611 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1612 static inline void MPV_motion_lowres(MpegEncContext *s,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1613 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1614 int dir, uint8_t **ref_picture,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1615 h264_chroma_mc_func *pix_op)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1616 {
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1617 int mx, my;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1618 int mb_x, mb_y, i;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1619 const int lowres= s->avctx->lowres;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1620 const int block_s= 8>>lowres;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1621
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1622 mb_x = s->mb_x;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1623 mb_y = s->mb_y;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1624
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1625 switch(s->mv_type) {
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1626 case MV_TYPE_16X16:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1627 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1628 0, 0, 0,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1629 ref_picture, pix_op,
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1630 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s, mb_y);
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1631 break;
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1632 case MV_TYPE_8X8:
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1633 mx = 0;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1634 my = 0;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1635 for(i=0;i<4;i++) {
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1636 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
1637 ref_picture[0], 0, 0,
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1638 (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
1639 s->width, s->height, s->linesize,
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1640 s->h_edge_pos >> lowres, s->v_edge_pos >> lowres,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1641 block_s, block_s, pix_op,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1642 s->mv[dir][i][0], s->mv[dir][i][1]);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1643
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1644 mx += s->mv[dir][i][0];
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1645 my += s->mv[dir][i][1];
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1646 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1647
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1648 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY))
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1649 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
1650 break;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1651 case MV_TYPE_FIELD:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1652 if (s->picture_structure == PICT_FRAME) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1653 /* top field */
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1654 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1655 1, 0, s->field_select[dir][0],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1656 ref_picture, pix_op,
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1657 s->mv[dir][0][0], s->mv[dir][0][1], block_s, mb_y);
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1658 /* bottom field */
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1659 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1660 1, 1, s->field_select[dir][1],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1661 ref_picture, pix_op,
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1662 s->mv[dir][1][0], s->mv[dir][1][1], block_s, mb_y);
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1663 } else {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1664 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != FF_B_TYPE && !s->first_field){
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1665 ref_picture= s->current_picture_ptr->data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1666 }
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1667
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1668 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1669 0, 0, s->field_select[dir][0],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1670 ref_picture, pix_op,
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1671 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s, mb_y>>1);
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1672 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1673 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1674 case MV_TYPE_16X8:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1675 for(i=0; i<2; i++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1676 uint8_t ** ref2picture;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1677
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1678 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == FF_B_TYPE || s->first_field){
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1679 ref2picture= ref_picture;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1680 }else{
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1681 ref2picture= s->current_picture_ptr->data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1682 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1683
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1684 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1685 0, 0, s->field_select[dir][i],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1686 ref2picture, pix_op,
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1687 s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s, mb_y>>1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1688
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1689 dest_y += 2*block_s*s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1690 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1691 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1692 }
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1693 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1694 case MV_TYPE_DMV:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1695 if(s->picture_structure == PICT_FRAME){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1696 for(i=0; i<2; i++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1697 int j;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1698 for(j=0; j<2; j++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1699 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1700 1, j, j^i,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1701 ref_picture, pix_op,
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1702 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s, mb_y);
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1703 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1704 pix_op = s->dsp.avg_h264_chroma_pixels_tab;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1705 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1706 }else{
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1707 for(i=0; i<2; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1708 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1709 0, 0, s->picture_structure != i+1,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1710 ref_picture, pix_op,
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
1711 s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s, mb_y>>1);
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1712
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1713 // after put we make avg of the same block
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1714 pix_op = s->dsp.avg_h264_chroma_pixels_tab;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1715
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1716 //opposite parity is always in the same frame if this is second field
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1717 if(!s->first_field){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1718 ref_picture = s->current_picture_ptr->data;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1719 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1720 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1721 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1722 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1723 default: assert(0);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
1724 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1725 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1726
986e461dc072 Initial revision
glantau
parents:
diff changeset
1727 /* put block[] to dest[] */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1728 static inline void put_dct(MpegEncContext *s,
1651
ccf7c96a630f h263 modified quantization fix
michael
parents: 1644
diff changeset
1729 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1730 {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1731 s->dct_unquantize_intra(s, block, i, qscale);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
1732 s->dsp.idct_put (dest, line_size, block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1733 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1734
986e461dc072 Initial revision
glantau
parents:
diff changeset
1735 /* add block[] to dest[] */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1736 static inline void add_dct(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1737 DCTELEM *block, int i, uint8_t *dest, int line_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1738 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1739 if (s->block_last_index[i] >= 0) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
1740 s->dsp.idct_add (dest, line_size, block);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1741 }
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1742 }
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1743
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1744 static inline void add_dequant_dct(MpegEncContext *s,
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1745 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale)
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1746 {
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1747 if (s->block_last_index[i] >= 0) {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1748 s->dct_unquantize_inter(s, block, i, qscale);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1749
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
1750 s->dsp.idct_add (dest, line_size, block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1751 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1752 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1753
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1754 /**
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1755 * cleans dc, ac, coded_block for the current non intra MB
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1756 */
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1757 void ff_clean_intra_table_entries(MpegEncContext *s)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1758 {
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
1759 int wrap = s->b8_stride;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1760 int xy = s->block_index[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1761
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1762 s->dc_val[0][xy ] =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1763 s->dc_val[0][xy + 1 ] =
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1764 s->dc_val[0][xy + wrap] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1765 s->dc_val[0][xy + 1 + wrap] = 1024;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1766 /* ac pred */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1767 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1768 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t));
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1769 if (s->msmpeg4_version>=3) {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1770 s->coded_block[xy ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1771 s->coded_block[xy + 1 ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1772 s->coded_block[xy + wrap] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1773 s->coded_block[xy + 1 + wrap] = 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1774 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1775 /* chroma */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
1776 wrap = s->mb_stride;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
1777 xy = s->mb_x + s->mb_y * wrap;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1778 s->dc_val[1][xy] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1779 s->dc_val[2][xy] = 1024;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1780 /* ac pred */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1781 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1782 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1783
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
1784 s->mbintra_table[xy]= 0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1785 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1786
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1787 /* generic function called after a macroblock has been parsed by the
986e461dc072 Initial revision
glantau
parents:
diff changeset
1788 decoder or after it has been encoded by the encoder.
986e461dc072 Initial revision
glantau
parents:
diff changeset
1789
986e461dc072 Initial revision
glantau
parents:
diff changeset
1790 Important variables used:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1791 s->mb_intra : true if intra macroblock
986e461dc072 Initial revision
glantau
parents:
diff changeset
1792 s->mv_dir : motion vector direction
986e461dc072 Initial revision
glantau
parents:
diff changeset
1793 s->mv_type : motion vector type
986e461dc072 Initial revision
glantau
parents:
diff changeset
1794 s->mv : motion vector
986e461dc072 Initial revision
glantau
parents:
diff changeset
1795 s->interlaced_dct : true if interlaced dct used (mpeg2)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1796 */
6580
b03c23f8f268 cosmetics: Break an overly long line.
diego
parents: 6535
diff changeset
1797 static av_always_inline
b03c23f8f268 cosmetics: Break an overly long line.
diego
parents: 6535
diff changeset
1798 void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64],
6658
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
1799 int lowres_flag, int is_mpeg12)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1800 {
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
1801 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
8948
886ef38c7b36 Get rid of some '#if CONFIG_MPEG_XVMC_DECODER' preprocessor checks around if
diego
parents: 8881
diff changeset
1802 if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
8855
6ce8ebfc9d86 use ff_xvmc for function names instead of XVMC_
iive
parents: 8832
diff changeset
1803 ff_xvmc_decode_mb(s);//xvmc uses pblocks
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1804 return;
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1805 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1806
1833
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
1807 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
1808 /* save DCT coefficients */
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
1809 int i,j;
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
1810 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
1811 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
1812 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
1813 *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
1814 }
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
1815
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1816 s->current_picture.qscale_table[mb_xy]= s->qscale;
108
1e4a4af694d1 exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents: 79
diff changeset
1817
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1818 /* update DC predictors for P macroblocks */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1819 if (!s->mb_intra) {
6658
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
1820 if (!is_mpeg12 && (s->h263_pred || s->h263_aic)) {
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1821 if(s->mbintra_table[mb_xy])
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1822 ff_clean_intra_table_entries(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1823 } else {
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1824 s->last_dc[0] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1825 s->last_dc[1] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1826 s->last_dc[2] = 128 << s->intra_dc_precision;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1827 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1828 }
6658
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
1829 else if (!is_mpeg12 && (s->h263_pred || s->h263_aic))
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1830 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
1831
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1832 if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==FF_B_TYPE) && s->avctx->mb_decision != FF_MB_DECISION_RD)) { //FIXME precalc
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1833 uint8_t *dest_y, *dest_cb, *dest_cr;
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1834 int dct_linesize, dct_offset;
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
1835 op_pixels_func (*op_pix)[4];
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
1836 qpel_mc_func (*op_qpix)[16];
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
1837 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this would be wrong for field pics
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1838 const int uvlinesize= s->current_picture.linesize[1];
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1839 const int readable= s->pict_type != FF_B_TYPE || s->encoding || s->avctx->draw_horiz_band || lowres_flag;
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1840 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
1841
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1842 /* avoid copy if macroblock skipped in last frame too */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1843 /* skip only during decoding as we might trash the buffers during encoding a bit */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1844 if(!s->encoding){
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1845 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy];
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1846 const int age= s->current_picture.age;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1847
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1848 assert(age);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1849
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2627
diff changeset
1850 if (s->mb_skipped) {
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2627
diff changeset
1851 s->mb_skipped= 0;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1852 assert(s->pict_type!=FF_I_TYPE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1853
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2627
diff changeset
1854 (*mbskip_ptr) ++; /* indicate that this time we skipped it */
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
1855 if(*mbskip_ptr >99) *mbskip_ptr= 99;
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
1856
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1857 /* 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
1858 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
1859 return;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1860 }
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
1861 } 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
1862 (*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
1863 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
1864 } else{
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
1865 *mbskip_ptr = 0; /* not skipped */
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
1866 }
717
6cba3b6196f0 optimization
michaelni
parents: 711
diff changeset
1867 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1868
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
1869 dct_linesize = linesize << s->interlaced_dct;
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1870 dct_offset =(s->interlaced_dct)? linesize : linesize*block_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1871
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
1872 if(readable){
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
1873 dest_y= s->dest[0];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
1874 dest_cb= s->dest[1];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
1875 dest_cr= s->dest[2];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
1876 }else{
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1877 dest_y = s->b_scratchpad;
1834
41c324b09fcc 100l (field picture decoding fix)
michael
parents: 1833
diff changeset
1878 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
1879 dest_cr= s->b_scratchpad+32*linesize;
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
1880 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1881
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1882 if (!s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1883 /* motion handling */
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
1884 /* decoding or more than one mb_type (MC was already done otherwise) */
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
1885 if(!s->encoding){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1886 if(lowres_flag){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1887 h264_chroma_mc_func *op_pix = s->dsp.put_h264_chroma_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1888
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1889 if (s->mv_dir & MV_DIR_FORWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1890 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
1891 op_pix = s->dsp.avg_h264_chroma_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1892 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1893 if (s->mv_dir & MV_DIR_BACKWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1894 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
1895 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1896 }else{
3807
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3780
diff changeset
1897 op_qpix= s->me.qpel_put;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1898 if ((!s->no_rounding) || s->pict_type==FF_B_TYPE){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1899 op_pix = s->dsp.put_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1900 }else{
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1901 op_pix = s->dsp.put_no_rnd_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1902 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1903 if (s->mv_dir & MV_DIR_FORWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1904 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
1905 op_pix = s->dsp.avg_pixels_tab;
3807
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3780
diff changeset
1906 op_qpix= s->me.qpel_avg;
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1907 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1908 if (s->mv_dir & MV_DIR_BACKWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1909 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
1910 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1911 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1912 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1913
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1914 /* skip dequant / idct if we are really late ;) */
2792
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
1915 if(s->hurry_up>1) goto skip_idct;
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
1916 if(s->avctx->skip_idct){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1917 if( (s->avctx->skip_idct >= AVDISCARD_NONREF && s->pict_type == FF_B_TYPE)
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
1918 ||(s->avctx->skip_idct >= AVDISCARD_NONKEY && s->pict_type != FF_I_TYPE)
2792
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
1919 || s->avctx->skip_idct >= AVDISCARD_ALL)
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
1920 goto skip_idct;
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
1921 }
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1922
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1923 /* add dct residue */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1924 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
1925 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1926 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1927 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
1928 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
1929 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
1930
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1931 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
3309
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1932 if (s->chroma_y_shift){
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1933 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1934 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1935 }else{
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1936 dct_linesize >>= 1;
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1937 dct_offset >>=1;
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1938 add_dequant_dct(s, block[4], 4, dest_cb, dct_linesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1939 add_dequant_dct(s, block[5], 5, dest_cr, dct_linesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1940 add_dequant_dct(s, block[6], 6, dest_cb + dct_offset, dct_linesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1941 add_dequant_dct(s, block[7], 7, dest_cr + dct_offset, dct_linesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1942 }
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
1943 }
6658
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
1944 } else if(is_mpeg12 || (s->codec_id != CODEC_ID_WMV2)){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1945 add_dct(s, block[0], 0, dest_y , dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1946 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1947 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1948 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
1949
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1950 if(!CONFIG_GRAY || !(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
1951 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
1952 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
1953 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
1954 }else{
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
1955 //chroma422
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
1956 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
1957 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
1958
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
1959 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
1960 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
1961 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
1962 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
1963 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
1964 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
1965 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
1966 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
1967 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
1968 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
1969 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
1970 }//fi gray
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
1971 }
10745
a47f207fe4b5 Get rid of pointless CONFIG_WMV2 definition.
diego
parents: 10606
diff changeset
1972 else if (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) {
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
1973 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
1974 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1975 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1976 /* dct only in intra block */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1977 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
1978 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1979 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1980 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1981 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1982
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
1983 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
3309
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1984 if(s->chroma_y_shift){
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1985 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1986 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1987 }else{
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1988 dct_offset >>=1;
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1989 dct_linesize >>=1;
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1990 put_dct(s, block[4], 4, dest_cb, dct_linesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1991 put_dct(s, block[5], 5, dest_cr, dct_linesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1992 put_dct(s, block[6], 6, dest_cb + dct_offset, dct_linesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1993 put_dct(s, block[7], 7, dest_cr + dct_offset, dct_linesize, s->chroma_qscale);
5e2c69db0ef7 MPEG-2 4:2:2 encoding support
bcoudurier
parents: 3305
diff changeset
1994 }
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
1995 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
1996 }else{
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1997 s->dsp.idct_put(dest_y , dct_linesize, block[0]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1998 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
1999 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2000 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
2001
8596
68e959302527 replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 8590
diff changeset
2002 if(!CONFIG_GRAY || !(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
2003 if(s->chroma_y_shift){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2004 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
2005 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
2006 }else{
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2007
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2008 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
2009 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
2010
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2011 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
2012 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
2013 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
2014 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
2015 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
2016 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
2017 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
2018 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
2019 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
2020 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2021 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2022 }//gray
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2023 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2024 }
2792
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
2025 skip_idct:
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
2026 if(!readable){
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
2027 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
2028 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
2029 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
2030 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2031 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2032 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2033
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2034 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
2035 #if !CONFIG_SMALL
6658
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
2036 if(s->out_format == FMT_MPEG1) {
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
2037 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1, 1);
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
2038 else MPV_decode_mb_internal(s, block, 0, 1);
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
2039 } else
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
2040 #endif
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
2041 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1, 0);
7ecd59aa5757 Unroll codepath
benoit
parents: 6580
diff changeset
2042 else MPV_decode_mb_internal(s, block, 0, 0);
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2043 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2044
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2045 /**
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2046 *
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2047 * @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
2048 */
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2049 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2050 if (s->avctx->draw_horiz_band) {
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2051 AVFrame *src;
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2052 const int field_pic= s->picture_structure != PICT_FRAME;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2053 int offset[4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2054
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2055 h= FFMIN(h, (s->avctx->height>>field_pic) - y);
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2056
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2057 if(field_pic && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)){
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2058 h <<= 1;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2059 y <<= 1;
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2060 if(s->first_field) return;
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2061 }
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2062
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
2063 if(s->pict_type==FF_B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER))
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2064 src= (AVFrame*)s->current_picture_ptr;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2065 else if(s->last_picture_ptr)
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2066 src= (AVFrame*)s->last_picture_ptr;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2067 else
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2068 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2069
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
2070 if(s->pict_type==FF_B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2071 offset[0]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2072 offset[1]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2073 offset[2]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2074 offset[3]= 0;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2075 }else{
6377
michael
parents: 6342
diff changeset
2076 offset[0]= y * s->linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2077 offset[1]=
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2078 offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2079 offset[3]= 0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2080 }
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2081
813
dfaa1c45bd27 cleanup
michaelni
parents: 809
diff changeset
2082 emms_c();
dfaa1c45bd27 cleanup
michaelni
parents: 809
diff changeset
2083
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2084 s->avctx->draw_horiz_band(s->avctx, src, offset,
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2085 y, s->picture_structure, h);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2086 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2087 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2088
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2089 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
2090 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this would be wrong for field pics
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2091 const int uvlinesize= s->current_picture.linesize[1];
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2092 const int mb_size= 4 - s->avctx->lowres;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2093
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
2094 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
2095 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
2096 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
2097 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
2098 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
2099 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
2100 //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
2101
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2102 s->dest[0] = s->current_picture.data[0] + ((s->mb_x - 1) << mb_size);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2103 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
2104 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
2105
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6459
diff changeset
2106 if(!(s->pict_type==FF_B_TYPE && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME))
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2107 {
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2108 if(s->picture_structure==PICT_FRAME){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2109 s->dest[0] += s->mb_y * linesize << mb_size;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2110 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2111 s->dest[2] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift);
10604
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2112 }else{
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2113 s->dest[0] += (s->mb_y>>1) * linesize << mb_size;
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2114 s->dest[1] += (s->mb_y>>1) * uvlinesize << (mb_size - s->chroma_y_shift);
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2115 s->dest[2] += (s->mb_y>>1) * uvlinesize << (mb_size - s->chroma_y_shift);
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2116 assert((s->mb_y&1) == (s->picture_structure == PICT_BOTTOM_FIELD));
ce2cf9e32b09 Set mb_y in mpeg2 field pictures like h264 does.
michael
parents: 10137
diff changeset
2117 }
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2118 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2119 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2120
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2121 void ff_mpeg_flush(AVCodecContext *avctx){
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2122 int i;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2123 MpegEncContext *s = avctx->priv_data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2124
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2125 if(s==NULL || s->picture==NULL)
1751
3f1125adbc84 avcodec_flush_buffers() fix
michael
parents: 1749
diff changeset
2126 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2127
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2128 for(i=0; i<MAX_PICTURE_COUNT; i++){
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2129 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2130 || s->picture[i].type == FF_BUFFER_TYPE_USER))
9124
7f0d34340349 Add frame buffer allocators. aka simplify calls to
gb
parents: 9089
diff changeset
2131 free_frame_buffer(s, &s->picture[i]);
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2132 }
1601
a70c07e13e8e flush fix (untested)
michael
parents: 1599
diff changeset
2133 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2134
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
2135 s->mb_x= s->mb_y= 0;
9644
15660ad4c641 decode mpeg-2 closed gop first b frames, fix issue #824
bcoudurier
parents: 9643
diff changeset
2136 s->closed_gop= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2137
1395
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
2138 s->parse_context.state= -1;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
2139 s->parse_context.frame_start_found= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
2140 s->parse_context.overread= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
2141 s->parse_context.overread_index= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
2142 s->parse_context.index= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
2143 s->parse_context.last_index= 0;
1851
07a4c1c4b929 100l (divx5 b frame + seeking + flush fix)
michael
parents: 1848
diff changeset
2144 s->bitstream_buffer_size=0;
4346
855350bd0daf some interlaced direct sanity checks
michael
parents: 4327
diff changeset
2145 s->pp_time=0;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2146 }
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2147
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2148 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
2149 DCTELEM *block, int n, int qscale)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2150 {
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
2151 int i, level, nCoeffs;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2152 const uint16_t *quant_matrix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2153
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2154 nCoeffs= s->block_last_index[n];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2155
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2156 if (n < 4)
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2157 block[0] = block[0] * s->y_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2158 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2159 block[0] = block[0] * s->c_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2160 /* XXX: only mpeg1 */
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2161 quant_matrix = s->intra_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2162 for(i=1;i<=nCoeffs;i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2163 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2164 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2165 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2166 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2167 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2168 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2169 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2170 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2171 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2172 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2173 level = (level - 1) | 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2174 }
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2175 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2176 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2177 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2178 }
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
2179
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2180 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2181 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2182 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2183 int i, level, nCoeffs;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2184 const uint16_t *quant_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2185
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2186 nCoeffs= s->block_last_index[n];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2187
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2188 quant_matrix = s->inter_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2189 for(i=0; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2190 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2191 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2192 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2193 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2194 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2195 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2196 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2197 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2198 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2199 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2200 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2201 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2202 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2203 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2204 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2205 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2206 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2207 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2208
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2209 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2210 DCTELEM *block, int n, int qscale)
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2211 {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2212 int i, level, nCoeffs;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2213 const uint16_t *quant_matrix;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2214
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2215 if(s->alternate_scan) nCoeffs= 63;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2216 else nCoeffs= s->block_last_index[n];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2217
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2218 if (n < 4)
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2219 block[0] = block[0] * s->y_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2220 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2221 block[0] = block[0] * s->c_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2222 quant_matrix = s->intra_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2223 for(i=1;i<=nCoeffs;i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2224 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2225 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2226 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2227 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2228 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2229 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2230 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2231 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2232 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2233 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2234 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2235 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2236 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2237 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2238
3281
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2239 static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s,
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2240 DCTELEM *block, int n, int qscale)
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2241 {
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2242 int i, level, nCoeffs;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2243 const uint16_t *quant_matrix;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2244 int sum=-1;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2245
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2246 if(s->alternate_scan) nCoeffs= 63;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2247 else nCoeffs= s->block_last_index[n];
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2248
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2249 if (n < 4)
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2250 block[0] = block[0] * s->y_dc_scale;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2251 else
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2252 block[0] = block[0] * s->c_dc_scale;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2253 quant_matrix = s->intra_matrix;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2254 for(i=1;i<=nCoeffs;i++) {
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2255 int j= s->intra_scantable.permutated[i];
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2256 level = block[j];
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2257 if (level) {
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2258 if (level < 0) {
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2259 level = -level;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2260 level = (int)(level * qscale * quant_matrix[j]) >> 3;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2261 level = -level;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2262 } else {
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2263 level = (int)(level * qscale * quant_matrix[j]) >> 3;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2264 }
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2265 block[j] = level;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2266 sum+=level;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2267 }
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2268 }
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2269 block[63]^=sum&1;
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2270 }
7fac25904a8b missmatch control for mpeg2 intra dequantization if bitexact=1
michael
parents: 3268
diff changeset
2271
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2272 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2273 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2274 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2275 int i, level, nCoeffs;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2276 const uint16_t *quant_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2277 int sum=-1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2278
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2279 if(s->alternate_scan) nCoeffs= 63;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2280 else nCoeffs= s->block_last_index[n];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2281
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2282 quant_matrix = s->inter_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2283 for(i=0; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2284 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2285 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2286 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2287 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2288 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2289 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2290 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2291 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2292 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2293 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2294 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2295 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2296 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2297 sum+=level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2298 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2299 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2300 block[63]^=sum&1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2301 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2302
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2303 static void dct_unquantize_h263_intra_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2304 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2305 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2306 int i, level, qmul, qadd;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2307 int nCoeffs;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2308
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2309 assert(s->block_last_index[n]>=0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2310
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2311 qmul = qscale << 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2312
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2313 if (!s->h263_aic) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2314 if (n < 4)
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2315 block[0] = block[0] * s->y_dc_scale;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2316 else
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2317 block[0] = block[0] * s->c_dc_scale;
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2318 qadd = (qscale - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2319 }else{
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2320 qadd = 0;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2321 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2322 if(s->ac_pred)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2323 nCoeffs=63;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2324 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2325 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2326
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2327 for(i=1; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2328 level = block[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2329 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2330 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2331 level = level * qmul - qadd;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2332 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2333 level = level * qmul + qadd;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2334 }
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2335 block[i] = level;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2336 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2337 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2338 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
2339
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2340 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
2341 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
2342 {
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
2343 int i, level, qmul, qadd;
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
2344 int nCoeffs;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2345
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2346 assert(s->block_last_index[n]>=0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2347
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2348 qadd = (qscale - 1) | 1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2349 qmul = qscale << 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2350
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2351 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2352
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
2353 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
2354 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
2355 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
2356 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
2357 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
2358 } 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
2359 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
2360 }
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
2361 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
2362 }
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
2363 }
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
2364 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2365
5265
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2366 /**
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2367 * set qscale and update qscale dependent variables.
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2368 */
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2369 void ff_set_qscale(MpegEncContext * s, int qscale)
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2370 {
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2371 if (qscale < 1)
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2372 qscale = 1;
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2373 else if (qscale > 31)
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2374 qscale = 31;
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2375
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2376 s->qscale = qscale;
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2377 s->chroma_qscale= s->chroma_qscale_table[qscale];
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2378
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2379 s->y_dc_scale= s->y_dc_scale_table[ qscale ];
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2380 s->c_dc_scale= s->c_dc_scale_table[ s->chroma_qscale ];
a5e1cc69033d move ff_set_qscale from h263.c to mpegvideo.c
aurel
parents: 5214
diff changeset
2381 }