annotate vc1.c @ 8871:199e9809eb5a libavcodec

some more K&R whitespace cosmetics
author diego
date Sat, 14 Feb 2009 19:39:07 +0000
parents e9d9d946f213
children e03f0d4f9e3d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1 /*
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2 * VC-1 and WMV3 decoder
4605
d4feec96fd64 Looks like I'll work on it this year too
kostya
parents: 4604
diff changeset
3 * Copyright (c) 2006-2007 Konstantin Shishkov
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4 * Partly based on vc9.c (c) 2005 Anonymous, Alex Beregszaszi, Michael Niedermayer
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
5 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
6 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
7 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
10 * 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: 3920
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
12 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3920
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
16 * Lesser General Public License for more details.
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
17 *
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
18 * 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: 3920
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
21 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
22
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
23 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8692
diff changeset
24 * @file libavcodec/vc1.c
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
25 * VC-1 and WMV3 decoder
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
26 *
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
27 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
28 #include "dsputil.h"
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
29 #include "avcodec.h"
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
30 #include "mpegvideo.h"
4926
194f4ced7c50 Move variables to vc1data.h
kostya
parents: 4902
diff changeset
31 #include "vc1.h"
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
32 #include "vc1data.h"
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
33 #include "vc1acdata.h"
4965
f9bb3aca0888 use header instead of copying table declarations
aurel
parents: 4962
diff changeset
34 #include "msmpeg4data.h"
5605
d92fa6e5fc8c move get_unary() to its own file
aurel
parents: 5519
diff changeset
35 #include "unary.h"
5849
c1d42c875be8 Use simple IDCT for now
kostya
parents: 5848
diff changeset
36 #include "simple_idct.h"
8627
d6bab465b82c moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents: 8624
diff changeset
37 #include "mathops.h"
8631
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
38 #include "vdpau_internal.h"
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
39
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
40 #undef NDEBUG
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
41 #include <assert.h>
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
42
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
43 #define MB_INTRA_VLC_BITS 9
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
44 #define DC_VLC_BITS 9
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
45 #define AC_VLC_BITS 9
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
46 static const uint16_t table_mb_intra[64][2];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
47
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
48
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
49 /**
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
50 * Init VC-1 specific tables and VC1Context members
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
51 * @param v The VC1Context to initialize
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
52 * @return Status
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
53 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
54 static int vc1_init_common(VC1Context *v)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
55 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
56 static int done = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
57 int i = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
58
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
59 v->hrd_rate = v->hrd_buffer = NULL;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
60
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
61 /* VLC tables */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
62 if(!done)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
63 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
64 done = 1;
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
65 init_vlc(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
66 ff_vc1_bfraction_bits, 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
67 ff_vc1_bfraction_codes, 1, 1, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
68 init_vlc(&ff_vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
69 ff_vc1_norm2_bits, 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
70 ff_vc1_norm2_codes, 1, 1, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
71 init_vlc(&ff_vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
72 ff_vc1_norm6_bits, 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
73 ff_vc1_norm6_codes, 2, 2, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
74 init_vlc(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
75 ff_vc1_imode_bits, 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
76 ff_vc1_imode_codes, 1, 1, 1);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
77 for (i=0; i<3; i++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
78 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
79 init_vlc(&ff_vc1_ttmb_vlc[i], VC1_TTMB_VLC_BITS, 16,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
80 ff_vc1_ttmb_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
81 ff_vc1_ttmb_codes[i], 2, 2, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
82 init_vlc(&ff_vc1_ttblk_vlc[i], VC1_TTBLK_VLC_BITS, 8,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
83 ff_vc1_ttblk_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
84 ff_vc1_ttblk_codes[i], 1, 1, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
85 init_vlc(&ff_vc1_subblkpat_vlc[i], VC1_SUBBLKPAT_VLC_BITS, 15,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
86 ff_vc1_subblkpat_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
87 ff_vc1_subblkpat_codes[i], 1, 1, 1);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
88 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
89 for(i=0; i<4; i++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
90 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
91 init_vlc(&ff_vc1_4mv_block_pattern_vlc[i], VC1_4MV_BLOCK_PATTERN_VLC_BITS, 16,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
92 ff_vc1_4mv_block_pattern_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
93 ff_vc1_4mv_block_pattern_codes[i], 1, 1, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
94 init_vlc(&ff_vc1_cbpcy_p_vlc[i], VC1_CBPCY_P_VLC_BITS, 64,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
95 ff_vc1_cbpcy_p_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
96 ff_vc1_cbpcy_p_codes[i], 2, 2, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
97 init_vlc(&ff_vc1_mv_diff_vlc[i], VC1_MV_DIFF_VLC_BITS, 73,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
98 ff_vc1_mv_diff_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
99 ff_vc1_mv_diff_codes[i], 2, 2, 1);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
100 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
101 for(i=0; i<8; i++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
102 init_vlc(&ff_vc1_ac_coeff_table[i], AC_VLC_BITS, vc1_ac_sizes[i],
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
103 &vc1_ac_tables[i][0][1], 8, 4,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
104 &vc1_ac_tables[i][0][0], 8, 4, 1);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
105 init_vlc(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
106 &ff_msmp4_mb_i_table[0][1], 4, 2,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
107 &ff_msmp4_mb_i_table[0][0], 4, 2, 1);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
108 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
109
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
110 /* Other defaults */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
111 v->pq = -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
112 v->mvrange = 0; /* 7.1.1.18, p80 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
113
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
114 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
115 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
116
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
117 /***********************************************************************/
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
118 /**
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
119 * @defgroup vc1bitplane VC-1 Bitplane decoding
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
120 * @see 8.7, p56
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
121 * @{
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
122 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
123
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
124 /**
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
125 * Imode types
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
126 * @{
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
127 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
128 enum Imode {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
129 IMODE_RAW,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
130 IMODE_NORM2,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
131 IMODE_DIFF2,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
132 IMODE_NORM6,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
133 IMODE_DIFF6,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
134 IMODE_ROWSKIP,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
135 IMODE_COLSKIP
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
136 };
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
137 /** @} */ //imode defines
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
138
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
139 /** Decode rows by checking if they are skipped
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
140 * @param plane Buffer to store decoded bits
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
141 * @param[in] width Width of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
142 * @param[in] height Height of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
143 * @param[in] stride of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
144 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
145 static void decode_rowskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
146 int x, y;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
147
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
148 for (y=0; y<height; y++){
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
149 if (!get_bits1(gb)) //rowskip
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
150 memset(plane, 0, width);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
151 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
152 for (x=0; x<width; x++)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
153 plane[x] = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
154 plane += stride;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
155 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
156 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
157
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
158 /** Decode columns by checking if they are skipped
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
159 * @param plane Buffer to store decoded bits
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
160 * @param[in] width Width of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
161 * @param[in] height Height of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
162 * @param[in] stride of this buffer
5299
4623928e3b9e Replace non-existing @fixme doxygen tags with @todo.
diego
parents: 5228
diff changeset
163 * @todo FIXME: Optimize
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
164 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
165 static void decode_colskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
166 int x, y;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
167
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
168 for (x=0; x<width; x++){
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
169 if (!get_bits1(gb)) //colskip
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
170 for (y=0; y<height; y++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
171 plane[y*stride] = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
172 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
173 for (y=0; y<height; y++)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
174 plane[y*stride] = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
175 plane ++;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
176 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
177 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
178
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
179 /** Decode a bitplane's bits
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
180 * @param data bitplane where to store the decode bits
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
181 * @param[out] raw_flag pointer to the flag indicating that this bitplane is not coded explicitly
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
182 * @param v VC-1 context for bit reading and logging
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
183 * @return Status
5299
4623928e3b9e Replace non-existing @fixme doxygen tags with @todo.
diego
parents: 5228
diff changeset
184 * @todo FIXME: Optimize
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
185 */
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
186 static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
187 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
188 GetBitContext *gb = &v->s.gb;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
189
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
190 int imode, x, y, code, offset;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
191 uint8_t invert, *planep = data;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
192 int width, height, stride;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
193
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
194 width = v->s.mb_width;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
195 height = v->s.mb_height;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
196 stride = v->s.mb_stride;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
197 invert = get_bits1(gb);
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
198 imode = get_vlc2(gb, ff_vc1_imode_vlc.table, VC1_IMODE_VLC_BITS, 1);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
199
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
200 *raw_flag = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
201 switch (imode)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
202 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
203 case IMODE_RAW:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
204 //Data is actually read in the MB layer (same for all tests == "raw")
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
205 *raw_flag = 1; //invert ignored
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
206 return invert;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
207 case IMODE_DIFF2:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
208 case IMODE_NORM2:
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
209 if ((height * width) & 1)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
210 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
211 *planep++ = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
212 offset = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
213 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
214 else offset = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
215 // decode bitplane as one long line
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
216 for (y = offset; y < height * width; y += 2) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
217 code = get_vlc2(gb, ff_vc1_norm2_vlc.table, VC1_NORM2_VLC_BITS, 1);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
218 *planep++ = code & 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
219 offset++;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
220 if(offset == width) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
221 offset = 0;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
222 planep += stride - width;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
223 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
224 *planep++ = code >> 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
225 offset++;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
226 if(offset == width) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
227 offset = 0;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
228 planep += stride - width;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
229 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
230 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
231 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
232 case IMODE_DIFF6:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
233 case IMODE_NORM6:
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
234 if(!(height % 3) && (width % 3)) { // use 2x3 decoding
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
235 for(y = 0; y < height; y+= 3) {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
236 for(x = width & 1; x < width; x += 2) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
237 code = get_vlc2(gb, ff_vc1_norm6_vlc.table, VC1_NORM6_VLC_BITS, 2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
238 if(code < 0){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
239 av_log(v->s.avctx, AV_LOG_DEBUG, "invalid NORM-6 VLC\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
240 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
241 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
242 planep[x + 0] = (code >> 0) & 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
243 planep[x + 1] = (code >> 1) & 1;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
244 planep[x + 0 + stride] = (code >> 2) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
245 planep[x + 1 + stride] = (code >> 3) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
246 planep[x + 0 + stride * 2] = (code >> 4) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
247 planep[x + 1 + stride * 2] = (code >> 5) & 1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
248 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
249 planep += stride * 3;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
250 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
251 if(width & 1) decode_colskip(data, 1, height, stride, &v->s.gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
252 } else { // 3x2
3405
58c4fd135462 Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents: 3404
diff changeset
253 planep += (height & 1) * stride;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
254 for(y = height & 1; y < height; y += 2) {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
255 for(x = width % 3; x < width; x += 3) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
256 code = get_vlc2(gb, ff_vc1_norm6_vlc.table, VC1_NORM6_VLC_BITS, 2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
257 if(code < 0){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
258 av_log(v->s.avctx, AV_LOG_DEBUG, "invalid NORM-6 VLC\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
259 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
260 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
261 planep[x + 0] = (code >> 0) & 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
262 planep[x + 1] = (code >> 1) & 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
263 planep[x + 2] = (code >> 2) & 1;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
264 planep[x + 0 + stride] = (code >> 3) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
265 planep[x + 1 + stride] = (code >> 4) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
266 planep[x + 2 + stride] = (code >> 5) & 1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
267 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
268 planep += stride * 2;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
269 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
270 x = width % 3;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
271 if(x) decode_colskip(data , x, height , stride, &v->s.gb);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
272 if(height & 1) decode_rowskip(data+x, width - x, 1, stride, &v->s.gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
273 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
274 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
275 case IMODE_ROWSKIP:
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
276 decode_rowskip(data, width, height, stride, &v->s.gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
277 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
278 case IMODE_COLSKIP:
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
279 decode_colskip(data, width, height, stride, &v->s.gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
280 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
281 default: break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
282 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
283
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
284 /* Applying diff operator */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
285 if (imode == IMODE_DIFF2 || imode == IMODE_DIFF6)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
286 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
287 planep = data;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
288 planep[0] ^= invert;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
289 for (x=1; x<width; x++)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
290 planep[x] ^= planep[x-1];
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
291 for (y=1; y<height; y++)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
292 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
293 planep += stride;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
294 planep[0] ^= planep[-stride];
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
295 for (x=1; x<width; x++)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
296 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
297 if (planep[x-1] != planep[x-stride]) planep[x] ^= invert;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
298 else planep[x] ^= planep[x-1];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
299 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
300 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
301 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
302 else if (invert)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
303 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
304 planep = data;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
305 for (x=0; x<stride*height; x++) planep[x] = !planep[x]; //FIXME stride
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
306 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
307 return (imode<<1) + invert;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
308 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
309
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
310 /** @} */ //Bitplane group
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
311
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
312 #define FILTSIGN(a) ((a) >= 0 ? 1 : -1)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
313 /**
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
314 * VC-1 in-loop deblocking filter for one line
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
315 * @param src source block type
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
316 * @param stride block stride
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
317 * @param pq block quantizer
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
318 * @return whether other 3 pairs should be filtered or not
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
319 * @see 8.6
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
320 */
8623
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
321 static int av_always_inline vc1_filter_line(uint8_t* src, int stride, int pq){
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
322 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
323
8623
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
324 int a0 = (2*(src[-2*stride] - src[ 1*stride]) - 5*(src[-1*stride] - src[ 0*stride]) + 4) >> 3;
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
325 int a0_sign = a0 >> 31; /* Store sign */
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
326 a0 = (a0 ^ a0_sign) - a0_sign; /* a0 = FFABS(a0); */
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
327 if(a0 < pq){
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
328 int a1 = FFABS((2*(src[-4*stride] - src[-1*stride]) - 5*(src[-3*stride] - src[-2*stride]) + 4) >> 3);
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
329 int a2 = FFABS((2*(src[ 0*stride] - src[ 3*stride]) - 5*(src[ 1*stride] - src[ 2*stride]) + 4) >> 3);
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
330 if(a1 < a0 || a2 < a0){
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
331 int clip = src[-1*stride] - src[ 0*stride];
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
332 int clip_sign = clip >> 31;
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
333 clip = ((clip ^ clip_sign) - clip_sign)>>1;
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
334 if(clip){
8623
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
335 int a3 = FFMIN(a1, a2);
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
336 int d = 5 * (a3 - a0);
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
337 int d_sign = (d >> 31);
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
338 d = ((d ^ d_sign) - d_sign) >> 3;
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
339 d_sign ^= a0_sign;
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
340
8624
b1663f732e67 Fix 10L in r16670 (broke deblocking code)
darkshikari
parents: 8623
diff changeset
341 if( d_sign ^ clip_sign )
8623
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
342 d = 0;
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
343 else{
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
344 d = FFMIN(d, clip);
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
345 d = (d ^ d_sign) - d_sign; /* Restore sign */
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
346 src[-1*stride] = cm[src[-1*stride] - d];
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
347 src[ 0*stride] = cm[src[ 0*stride] + d];
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
348 }
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
349 return 1;
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
350 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
351 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
352 }
8623
8f9f86b93f88 Faster VC-1 C loopfilter using lots of xor magic
darkshikari
parents: 8584
diff changeset
353 return 0;
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
354 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
356 /**
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
357 * VC-1 in-loop deblocking filter
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
358 * @param src source block type
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
359 * @param step distance between horizontally adjacent elements
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
360 * @param stride distance between vertically adjacent elements
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
361 * @param len edge length to filter (4 or 8 pixels)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
362 * @param pq block quantizer
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
363 * @see 8.6
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
364 */
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
365 static void vc1_loop_filter(uint8_t* src, int step, int stride, int len, int pq)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
366 {
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
367 int i;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
368 int filt3;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
369
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
370 for(i = 0; i < len; i += 4){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
371 filt3 = vc1_filter_line(src + 2*step, stride, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
372 if(filt3){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
373 vc1_filter_line(src + 0*step, stride, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
374 vc1_filter_line(src + 1*step, stride, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
375 vc1_filter_line(src + 3*step, stride, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
376 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
377 src += step * 4;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
378 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
379 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
380
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
381 static void vc1_loop_filter_iblk(MpegEncContext *s, int pq)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
382 {
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
383 int i, j;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
384 if(!s->first_slice_line)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
385 vc1_loop_filter(s->dest[0], 1, s->linesize, 16, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
386 vc1_loop_filter(s->dest[0] + 8*s->linesize, 1, s->linesize, 16, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
387 for(i = !s->mb_x*8; i < 16; i += 8)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
388 vc1_loop_filter(s->dest[0] + i, s->linesize, 1, 16, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
389 for(j = 0; j < 2; j++){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
390 if(!s->first_slice_line)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
391 vc1_loop_filter(s->dest[j+1], 1, s->uvlinesize, 8, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
392 if(s->mb_x)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
393 vc1_loop_filter(s->dest[j+1], s->uvlinesize, 1, 8, pq);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
394 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
395 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
396
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
397 /***********************************************************************/
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
398 /** VOP Dquant decoding
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
399 * @param v VC-1 Context
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
400 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
401 static int vop_dquant_decoding(VC1Context *v)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
402 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
403 GetBitContext *gb = &v->s.gb;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
404 int pqdiff;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
405
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
406 //variable size
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
407 if (v->dquant == 2)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
408 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
409 pqdiff = get_bits(gb, 3);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
410 if (pqdiff == 7) v->altpq = get_bits(gb, 5);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
411 else v->altpq = v->pq + pqdiff + 1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
412 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
413 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
414 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
415 v->dquantfrm = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
416 if ( v->dquantfrm )
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
417 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
418 v->dqprofile = get_bits(gb, 2);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
419 switch (v->dqprofile)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
420 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
421 case DQPROFILE_SINGLE_EDGE:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
422 case DQPROFILE_DOUBLE_EDGES:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
423 v->dqsbedge = get_bits(gb, 2);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
424 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
425 case DQPROFILE_ALL_MBS:
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
426 v->dqbilevel = get_bits1(gb);
5682
8bf94c994691 In case when any quantizer may occur, HALFPQ should be zero
kostya
parents: 5605
diff changeset
427 if(!v->dqbilevel)
8bf94c994691 In case when any quantizer may occur, HALFPQ should be zero
kostya
parents: 5605
diff changeset
428 v->halfpq = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
429 default: break; //Forbidden ?
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
430 }
3451
45724ba8d666 Fix mquant selection for ALL_MBS mode
kostya
parents: 3450
diff changeset
431 if (v->dqbilevel || v->dqprofile != DQPROFILE_ALL_MBS)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
432 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
433 pqdiff = get_bits(gb, 3);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
434 if (pqdiff == 7) v->altpq = get_bits(gb, 5);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
435 else v->altpq = v->pq + pqdiff + 1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
436 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
437 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
438 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
439 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
440 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
441
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
442 /** Put block onto picture
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
443 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
444 static void vc1_put_block(VC1Context *v, DCTELEM block[6][64])
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
445 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
446 uint8_t *Y;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
447 int ys, us, vs;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
448 DSPContext *dsp = &v->s.dsp;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
449
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
450 if(v->rangeredfrm) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
451 int i, j, k;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
452 for(k = 0; k < 6; k++)
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
453 for(j = 0; j < 8; j++)
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
454 for(i = 0; i < 8; i++)
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
455 block[k][i + j*8] = ((block[k][i + j*8] - 128) << 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
456
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
457 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
458 ys = v->s.current_picture.linesize[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
459 us = v->s.current_picture.linesize[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
460 vs = v->s.current_picture.linesize[2];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
461 Y = v->s.dest[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
462
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
463 dsp->put_pixels_clamped(block[0], Y, ys);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
464 dsp->put_pixels_clamped(block[1], Y + 8, ys);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
465 Y += ys * 8;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
466 dsp->put_pixels_clamped(block[2], Y, ys);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
467 dsp->put_pixels_clamped(block[3], Y + 8, ys);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
468
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
469 if(!(v->s.flags & CODEC_FLAG_GRAY)) {
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
470 dsp->put_pixels_clamped(block[4], v->s.dest[1], us);
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
471 dsp->put_pixels_clamped(block[5], v->s.dest[2], vs);
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
472 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
473 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
474
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
475 /** Do motion compensation over 1 macroblock
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
476 * Mostly adapted hpel_motion and qpel_motion from mpegvideo.c
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
477 */
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
478 static void vc1_mc_1mv(VC1Context *v, int dir)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
479 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
480 MpegEncContext *s = &v->s;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
481 DSPContext *dsp = &v->s.dsp;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
482 uint8_t *srcY, *srcU, *srcV;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
483 int dxy, uvdxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
484
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
485 if(!v->s.last_picture.data[0])return;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
486
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
487 mx = s->mv[dir][0][0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
488 my = s->mv[dir][0][1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
489
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
490 // store motion vectors for further use in B frames
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
491 if(s->pict_type == FF_P_TYPE) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
492 s->current_picture.motion_val[1][s->block_index[0]][0] = mx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
493 s->current_picture.motion_val[1][s->block_index[0]][1] = my;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
494 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
495 uvmx = (mx + ((mx & 3) == 3)) >> 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
496 uvmy = (my + ((my & 3) == 3)) >> 1;
4258
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
497 if(v->fastuvmc) {
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
498 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
499 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
500 }
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
501 if(!dir) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
502 srcY = s->last_picture.data[0];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
503 srcU = s->last_picture.data[1];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
504 srcV = s->last_picture.data[2];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
505 } else {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
506 srcY = s->next_picture.data[0];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
507 srcU = s->next_picture.data[1];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
508 srcV = s->next_picture.data[2];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
509 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
510
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
511 src_x = s->mb_x * 16 + (mx >> 2);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
512 src_y = s->mb_y * 16 + (my >> 2);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
513 uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
514 uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
515
4681
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
516 if(v->profile != PROFILE_ADVANCED){
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
517 src_x = av_clip( src_x, -16, s->mb_width * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
518 src_y = av_clip( src_y, -16, s->mb_height * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
519 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
520 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
521 }else{
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
522 src_x = av_clip( src_x, -17, s->avctx->coded_width);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
523 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
524 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
525 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
526 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
527
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
528 srcY += src_y * s->linesize + src_x;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
529 srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
530 srcV += uvsrc_y * s->uvlinesize + uvsrc_x;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
531
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
532 /* for grayscale we should not try to read from unknown area */
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
533 if(s->flags & CODEC_FLAG_GRAY) {
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
534 srcU = s->edge_emu_buffer + 18 * s->linesize;
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
535 srcV = s->edge_emu_buffer + 18 * s->linesize;
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
536 }
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
537
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
538 if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
539 || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 16 - s->mspel*3
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
540 || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 16 - s->mspel*3){
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
541 uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
542
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
543 srcY -= s->mspel * (1 + s->linesize);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
544 ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2,
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
545 src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
546 srcY = s->edge_emu_buffer;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
547 ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1,
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
548 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
549 ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1,
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
550 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
551 srcU = uvbuf;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
552 srcV = uvbuf + 16;
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
553 /* if we deal with range reduction we need to scale source blocks */
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
554 if(v->rangeredfrm) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
555 int i, j;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
556 uint8_t *src, *src2;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
557
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
558 src = srcY;
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
559 for(j = 0; j < 17 + s->mspel*2; j++) {
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
560 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
561 src += s->linesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
562 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
563 src = srcU; src2 = srcV;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
564 for(j = 0; j < 9; j++) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
565 for(i = 0; i < 9; i++) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
566 src[i] = ((src[i] - 128) >> 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
567 src2[i] = ((src2[i] - 128) >> 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
568 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
569 src += s->uvlinesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
570 src2 += s->uvlinesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
571 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
572 }
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
573 /* if we deal with intensity compensation we need to scale source blocks */
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
574 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
575 int i, j;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
576 uint8_t *src, *src2;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
577
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
578 src = srcY;
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
579 for(j = 0; j < 17 + s->mspel*2; j++) {
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
580 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = v->luty[src[i]];
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
581 src += s->linesize;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
582 }
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
583 src = srcU; src2 = srcV;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
584 for(j = 0; j < 9; j++) {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
585 for(i = 0; i < 9; i++) {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
586 src[i] = v->lutuv[src[i]];
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
587 src2[i] = v->lutuv[src2[i]];
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
588 }
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
589 src += s->uvlinesize;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
590 src2 += s->uvlinesize;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
591 }
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
592 }
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
593 srcY += s->mspel * (1 + s->linesize);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
594 }
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
595
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
596 if(s->mspel) {
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
597 dxy = ((my & 3) << 2) | (mx & 3);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
598 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] , srcY , s->linesize, v->rnd);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
599 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8, srcY + 8, s->linesize, v->rnd);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
600 srcY += s->linesize * 8;
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
601 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize , srcY , s->linesize, v->rnd);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
602 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize + 8, srcY + 8, s->linesize, v->rnd);
3654
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
603 } else { // hpel mc - always used for luma
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
604 dxy = (my & 2) | ((mx & 2) >> 1);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
605
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
606 if(!v->rnd)
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
607 dsp->put_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16);
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
608 else
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
609 dsp->put_no_rnd_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
610 }
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
611
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
612 if(s->flags & CODEC_FLAG_GRAY) return;
3655
8dbf728f3967 Spelling
kostya
parents: 3654
diff changeset
613 /* Chroma MC always uses qpel bilinear */
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
614 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3);
3664
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
615 uvmx = (uvmx&3)<<1;
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
616 uvmy = (uvmy&3)<<1;
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
617 if(!v->rnd){
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
618 dsp->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
619 dsp->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
620 }else{
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
621 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
622 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
623 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
624 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
625
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
626 /** Do motion compensation for 4-MV macroblock - luminance block
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
627 */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
628 static void vc1_mc_4mv_luma(VC1Context *v, int n)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
629 {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
630 MpegEncContext *s = &v->s;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
631 DSPContext *dsp = &v->s.dsp;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
632 uint8_t *srcY;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
633 int dxy, mx, my, src_x, src_y;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
634 int off;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
635
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
636 if(!v->s.last_picture.data[0])return;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
637 mx = s->mv[0][n][0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
638 my = s->mv[0][n][1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
639 srcY = s->last_picture.data[0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
640
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
641 off = s->linesize * 4 * (n&2) + (n&1) * 8;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
642
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
643 src_x = s->mb_x * 16 + (n&1) * 8 + (mx >> 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
644 src_y = s->mb_y * 16 + (n&2) * 4 + (my >> 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
645
4681
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
646 if(v->profile != PROFILE_ADVANCED){
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
647 src_x = av_clip( src_x, -16, s->mb_width * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
648 src_y = av_clip( src_y, -16, s->mb_height * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
649 }else{
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
650 src_x = av_clip( src_x, -17, s->avctx->coded_width);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
651 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
652 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
653
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
654 srcY += src_y * s->linesize + src_x;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
655
3548
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
656 if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
3552
4a0f82c8dc43 Bicubic interpolation requires two additional pixels for block
kostya
parents: 3548
diff changeset
657 || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 8 - s->mspel*2
4a0f82c8dc43 Bicubic interpolation requires two additional pixels for block
kostya
parents: 3548
diff changeset
658 || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 8 - s->mspel*2){
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
659 srcY -= s->mspel * (1 + s->linesize);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
660 ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 9+s->mspel*2, 9+s->mspel*2,
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
661 src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
662 srcY = s->edge_emu_buffer;
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
663 /* if we deal with range reduction we need to scale source blocks */
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
664 if(v->rangeredfrm) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
665 int i, j;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
666 uint8_t *src;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
667
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
668 src = srcY;
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
669 for(j = 0; j < 9 + s->mspel*2; j++) {
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
670 for(i = 0; i < 9 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
671 src += s->linesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
672 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
673 }
3548
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
674 /* if we deal with intensity compensation we need to scale source blocks */
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
675 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
676 int i, j;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
677 uint8_t *src;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
678
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
679 src = srcY;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
680 for(j = 0; j < 9 + s->mspel*2; j++) {
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
681 for(i = 0; i < 9 + s->mspel*2; i++) src[i] = v->luty[src[i]];
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
682 src += s->linesize;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
683 }
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
684 }
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
685 srcY += s->mspel * (1 + s->linesize);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
686 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
687
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
688 if(s->mspel) {
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
689 dxy = ((my & 3) << 2) | (mx & 3);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
690 dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize, v->rnd);
3654
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
691 } else { // hpel mc - always used for luma
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
692 dxy = (my & 2) | ((mx & 2) >> 1);
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
693 if(!v->rnd)
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
694 dsp->put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8);
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
695 else
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
696 dsp->put_no_rnd_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
697 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
698 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
699
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
700 static inline int median4(int a, int b, int c, int d)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
701 {
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
702 if(a < b) {
3430
d0e85690841d Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents: 3429
diff changeset
703 if(c < d) return (FFMIN(b, d) + FFMAX(a, c)) / 2;
d0e85690841d Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents: 3429
diff changeset
704 else return (FFMIN(b, c) + FFMAX(a, d)) / 2;
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
705 } else {
3430
d0e85690841d Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents: 3429
diff changeset
706 if(c < d) return (FFMIN(a, d) + FFMAX(b, c)) / 2;
d0e85690841d Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents: 3429
diff changeset
707 else return (FFMIN(a, c) + FFMAX(b, d)) / 2;
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
708 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
709 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
710
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
711
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
712 /** Do motion compensation for 4-MV macroblock - both chroma blocks
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
713 */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
714 static void vc1_mc_4mv_chroma(VC1Context *v)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
715 {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
716 MpegEncContext *s = &v->s;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
717 DSPContext *dsp = &v->s.dsp;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
718 uint8_t *srcU, *srcV;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
719 int uvdxy, uvmx, uvmy, uvsrc_x, uvsrc_y;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
720 int i, idx, tx = 0, ty = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
721 int mvx[4], mvy[4], intra[4];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
722 static const int count[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
723
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
724 if(!v->s.last_picture.data[0])return;
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
725 if(s->flags & CODEC_FLAG_GRAY) return;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
726
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
727 for(i = 0; i < 4; i++) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
728 mvx[i] = s->mv[0][i][0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
729 mvy[i] = s->mv[0][i][1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
730 intra[i] = v->mb_type[0][s->block_index[i]];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
731 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
732
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
733 /* calculate chroma MV vector from four luma MVs */
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
734 idx = (intra[3] << 3) | (intra[2] << 2) | (intra[1] << 1) | intra[0];
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
735 if(!idx) { // all blocks are inter
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
736 tx = median4(mvx[0], mvx[1], mvx[2], mvx[3]);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
737 ty = median4(mvy[0], mvy[1], mvy[2], mvy[3]);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
738 } else if(count[idx] == 1) { // 3 inter blocks
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
739 switch(idx) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
740 case 0x1:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
741 tx = mid_pred(mvx[1], mvx[2], mvx[3]);
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
742 ty = mid_pred(mvy[1], mvy[2], mvy[3]);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
743 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
744 case 0x2:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
745 tx = mid_pred(mvx[0], mvx[2], mvx[3]);
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
746 ty = mid_pred(mvy[0], mvy[2], mvy[3]);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
747 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
748 case 0x4:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
749 tx = mid_pred(mvx[0], mvx[1], mvx[3]);
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
750 ty = mid_pred(mvy[0], mvy[1], mvy[3]);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
751 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
752 case 0x8:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
753 tx = mid_pred(mvx[0], mvx[1], mvx[2]);
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
754 ty = mid_pred(mvy[0], mvy[1], mvy[2]);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
755 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
756 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
757 } else if(count[idx] == 2) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
758 int t1 = 0, t2 = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
759 for(i=0; i<3;i++) if(!intra[i]) {t1 = i; break;}
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
760 for(i= t1+1; i<4; i++)if(!intra[i]) {t2 = i; break;}
3430
d0e85690841d Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents: 3429
diff changeset
761 tx = (mvx[t1] + mvx[t2]) / 2;
d0e85690841d Improve chroma MC: correct case for FASTUVMC=1, use slower but correct /2, and always use halfpel MC.
kostya
parents: 3429
diff changeset
762 ty = (mvy[t1] + mvy[t2]) / 2;
4683
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
763 } else {
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
764 s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
765 s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
766 return; //no need to do MC for inter blocks
4683
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
767 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
768
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
769 s->current_picture.motion_val[1][s->block_index[0]][0] = tx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
770 s->current_picture.motion_val[1][s->block_index[0]][1] = ty;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
771 uvmx = (tx + ((tx&3) == 3)) >> 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
772 uvmy = (ty + ((ty&3) == 3)) >> 1;
4258
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
773 if(v->fastuvmc) {
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
774 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
775 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
776 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
777
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
778 uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
779 uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
780
4681
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
781 if(v->profile != PROFILE_ADVANCED){
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
782 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
783 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
784 }else{
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
785 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
786 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
787 }
4680
71c1e1171e83 Proper handling of motion vectors for adv. profile
kostya
parents: 4605
diff changeset
788
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
789 srcU = s->last_picture.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
790 srcV = s->last_picture.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
3548
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
791 if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
792 || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9
3511
f88787aeed6b Correct edge MC for chroma
kostya
parents: 3510
diff changeset
793 || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9){
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
794 ff_emulated_edge_mc(s->edge_emu_buffer , srcU, s->uvlinesize, 8+1, 8+1,
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
795 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
796 ff_emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1,
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
797 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
798 srcU = s->edge_emu_buffer;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
799 srcV = s->edge_emu_buffer + 16;
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
800
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
801 /* if we deal with range reduction we need to scale source blocks */
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
802 if(v->rangeredfrm) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
803 int i, j;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
804 uint8_t *src, *src2;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
805
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
806 src = srcU; src2 = srcV;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
807 for(j = 0; j < 9; j++) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
808 for(i = 0; i < 9; i++) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
809 src[i] = ((src[i] - 128) >> 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
810 src2[i] = ((src2[i] - 128) >> 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
811 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
812 src += s->uvlinesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
813 src2 += s->uvlinesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
814 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
815 }
3548
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
816 /* if we deal with intensity compensation we need to scale source blocks */
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
817 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
818 int i, j;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
819 uint8_t *src, *src2;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
820
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
821 src = srcU; src2 = srcV;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
822 for(j = 0; j < 9; j++) {
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
823 for(i = 0; i < 9; i++) {
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
824 src[i] = v->lutuv[src[i]];
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
825 src2[i] = v->lutuv[src2[i]];
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
826 }
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
827 src += s->uvlinesize;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
828 src2 += s->uvlinesize;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
829 }
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
830 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
831 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
832
3655
8dbf728f3967 Spelling
kostya
parents: 3654
diff changeset
833 /* Chroma MC always uses qpel bilinear */
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
834 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3);
3664
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
835 uvmx = (uvmx&3)<<1;
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
836 uvmy = (uvmy&3)<<1;
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
837 if(!v->rnd){
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
838 dsp->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
839 dsp->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
840 }else{
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
841 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
842 dsp->put_no_rnd_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
843 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
844 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
845
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
846 static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
847
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
848 /**
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
849 * Decode Simple/Main Profiles sequence header
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
850 * @see Figure 7-8, p16-17
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
851 * @param avctx Codec context
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
852 * @param gb GetBit context initialized from Codec context extra_data
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
853 * @return Status
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
854 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
855 static int decode_sequence_header(AVCodecContext *avctx, GetBitContext *gb)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
856 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
857 VC1Context *v = avctx->priv_data;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
858
3692
7857ae840b0b Don't print header bits by default
kostya
parents: 3691
diff changeset
859 av_log(avctx, AV_LOG_DEBUG, "Header: %0X\n", show_bits(gb, 32));
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
860 v->profile = get_bits(gb, 2);
4604
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
861 if (v->profile == PROFILE_COMPLEX)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
862 {
4604
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
863 av_log(avctx, AV_LOG_ERROR, "WMV3 Complex Profile is not fully supported\n");
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
864 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
865
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
866 if (v->profile == PROFILE_ADVANCED)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
867 {
6145
ddf5d7fae101 Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents: 6099
diff changeset
868 v->zz_8x4 = ff_vc1_adv_progressive_8x4_zz;
ddf5d7fae101 Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents: 6099
diff changeset
869 v->zz_4x8 = ff_vc1_adv_progressive_4x8_zz;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
870 return decode_sequence_header_adv(v, gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
871 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
872 else
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
873 {
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
874 v->zz_8x4 = wmv2_scantableA;
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
875 v->zz_4x8 = wmv2_scantableB;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
876 v->res_sm = get_bits(gb, 2); //reserved
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
877 if (v->res_sm)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
878 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
879 av_log(avctx, AV_LOG_ERROR,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
880 "Reserved RES_SM=%i is forbidden\n", v->res_sm);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
881 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
882 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
883 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
884
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
885 // (fps-2)/4 (->30)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
886 v->frmrtq_postproc = get_bits(gb, 3); //common
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
887 // (bitrate-32kbps)/64kbps
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
888 v->bitrtq_postproc = get_bits(gb, 5); //common
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
889 v->s.loop_filter = get_bits1(gb); //common
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
890 if(v->s.loop_filter == 1 && v->profile == PROFILE_SIMPLE)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
891 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
892 av_log(avctx, AV_LOG_ERROR,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
893 "LOOPFILTER shell not be enabled in simple profile\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
894 }
7846
a7162bb60138 Make it possible to disable loop filter in VC-1.
kostya
parents: 7429
diff changeset
895 if(v->s.avctx->skip_loop_filter >= AVDISCARD_ALL)
a7162bb60138 Make it possible to disable loop filter in VC-1.
kostya
parents: 7429
diff changeset
896 v->s.loop_filter = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
897
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
898 v->res_x8 = get_bits1(gb); //reserved
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
899 v->multires = get_bits1(gb);
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
900 v->res_fasttx = get_bits1(gb);
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
901 if (!v->res_fasttx)
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
902 {
6001
f4859c13426b add ff_ prefix to all simple_idct symbols
aurel
parents: 5998
diff changeset
903 v->s.dsp.vc1_inv_trans_8x8 = ff_simple_idct;
f4859c13426b add ff_ prefix to all simple_idct symbols
aurel
parents: 5998
diff changeset
904 v->s.dsp.vc1_inv_trans_8x4 = ff_simple_idct84_add;
f4859c13426b add ff_ prefix to all simple_idct symbols
aurel
parents: 5998
diff changeset
905 v->s.dsp.vc1_inv_trans_4x8 = ff_simple_idct48_add;
6008
2c4164b26d53 Enable 4x4 IDCT for FASTTX=0 mode in WMV3
kostya
parents: 6001
diff changeset
906 v->s.dsp.vc1_inv_trans_4x4 = ff_simple_idct44_add;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
907 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
908
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
909 v->fastuvmc = get_bits1(gb); //common
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
910 if (!v->profile && !v->fastuvmc)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
911 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
912 av_log(avctx, AV_LOG_ERROR,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
913 "FASTUVMC unavailable in Simple Profile\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
914 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
915 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
916 v->extended_mv = get_bits1(gb); //common
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
917 if (!v->profile && v->extended_mv)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
918 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
919 av_log(avctx, AV_LOG_ERROR,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
920 "Extended MVs unavailable in Simple Profile\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
921 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
922 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
923 v->dquant = get_bits(gb, 2); //common
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
924 v->vstransform = get_bits1(gb); //common
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
925
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
926 v->res_transtab = get_bits1(gb);
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
927 if (v->res_transtab)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
928 {
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
929 av_log(avctx, AV_LOG_ERROR,
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
930 "1 for reserved RES_TRANSTAB is forbidden\n");
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
931 return -1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
932 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
933
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
934 v->overlap = get_bits1(gb); //common
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
935
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
936 v->s.resync_marker = get_bits1(gb);
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
937 v->rangered = get_bits1(gb);
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
938 if (v->rangered && v->profile == PROFILE_SIMPLE)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
939 {
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
940 av_log(avctx, AV_LOG_INFO,
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
941 "RANGERED should be set to 0 in simple profile\n");
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
942 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
943
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
944 v->s.max_b_frames = avctx->max_b_frames = get_bits(gb, 3); //common
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
945 v->quantizer_mode = get_bits(gb, 2); //common
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
946
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
947 v->finterpflag = get_bits1(gb); //common
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
948 v->res_rtm_flag = get_bits1(gb); //reserved
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
949 if (!v->res_rtm_flag)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
950 {
3538
f26bf13bbb69 Don't try to decode P-frames from old WMV3 variant until their format is figured
kostya
parents: 3528
diff changeset
951 // av_log(avctx, AV_LOG_ERROR,
f26bf13bbb69 Don't try to decode P-frames from old WMV3 variant until their format is figured
kostya
parents: 3528
diff changeset
952 // "0 for reserved RES_RTM_FLAG is forbidden\n");
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
953 av_log(avctx, AV_LOG_ERROR,
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
954 "Old WMV3 version detected, only I-frames will be decoded\n");
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
955 //return -1;
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
956 }
4742
184d33cce3b6 FASTTX==0 means additional 16 bits in extradata
kostya
parents: 4741
diff changeset
957 //TODO: figure out what they mean (always 0x402F)
184d33cce3b6 FASTTX==0 means additional 16 bits in extradata
kostya
parents: 4741
diff changeset
958 if(!v->res_fasttx) skip_bits(gb, 16);
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
959 av_log(avctx, AV_LOG_DEBUG,
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
960 "Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n"
3457
ad66c11aeab4 FastUVMV vs FastUVMC typo, noticed by bond
diego
parents: 3453
diff changeset
961 "LoopFilter=%i, MultiRes=%i, FastUVMC=%i, Extended MV=%i\n"
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
962 "Rangered=%i, VSTransform=%i, Overlap=%i, SyncMarker=%i\n"
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
963 "DQuant=%i, Quantizer mode=%i, Max B frames=%i\n",
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
964 v->profile, v->frmrtq_postproc, v->bitrtq_postproc,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
965 v->s.loop_filter, v->multires, v->fastuvmc, v->extended_mv,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
966 v->rangered, v->vstransform, v->overlap, v->s.resync_marker,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
967 v->dquant, v->quantizer_mode, avctx->max_b_frames
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
968 );
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
969 return 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
970 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
971
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
972 static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
973 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
974 v->res_rtm_flag = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
975 v->level = get_bits(gb, 3);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
976 if(v->level >= 5)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
977 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
978 av_log(v->s.avctx, AV_LOG_ERROR, "Reserved LEVEL %i\n",v->level);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
979 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
980 v->chromaformat = get_bits(gb, 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
981 if (v->chromaformat != 1)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
982 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
983 av_log(v->s.avctx, AV_LOG_ERROR,
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
984 "Only 4:2:0 chroma format supported\n");
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
985 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
986 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
987
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
988 // (fps-2)/4 (->30)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
989 v->frmrtq_postproc = get_bits(gb, 3); //common
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
990 // (bitrate-32kbps)/64kbps
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
991 v->bitrtq_postproc = get_bits(gb, 5); //common
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
992 v->postprocflag = get_bits1(gb); //common
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
993
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
994 v->s.avctx->coded_width = (get_bits(gb, 12) + 1) << 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
995 v->s.avctx->coded_height = (get_bits(gb, 12) + 1) << 1;
4474
82277cf5f051 Set codec dimensions in extradata parsing
kostya
parents: 4471
diff changeset
996 v->s.avctx->width = v->s.avctx->coded_width;
82277cf5f051 Set codec dimensions in extradata parsing
kostya
parents: 4471
diff changeset
997 v->s.avctx->height = v->s.avctx->coded_height;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
998 v->broadcast = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
999 v->interlace = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1000 v->tfcntrflag = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1001 v->finterpflag = get_bits1(gb);
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1002 skip_bits1(gb); // reserved
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1003
4680
71c1e1171e83 Proper handling of motion vectors for adv. profile
kostya
parents: 4605
diff changeset
1004 v->s.h_edge_pos = v->s.avctx->coded_width;
71c1e1171e83 Proper handling of motion vectors for adv. profile
kostya
parents: 4605
diff changeset
1005 v->s.v_edge_pos = v->s.avctx->coded_height;
71c1e1171e83 Proper handling of motion vectors for adv. profile
kostya
parents: 4605
diff changeset
1006
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1007 av_log(v->s.avctx, AV_LOG_DEBUG,
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1008 "Advanced Profile level %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1009 "LoopFilter=%i, ChromaFormat=%i, Pulldown=%i, Interlace: %i\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1010 "TFCTRflag=%i, FINTERPflag=%i\n",
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1011 v->level, v->frmrtq_postproc, v->bitrtq_postproc,
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1012 v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace,
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1013 v->tfcntrflag, v->finterpflag
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1014 );
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1015
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1016 v->psf = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1017 if(v->psf) { //PsF, 6.1.13
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1018 av_log(v->s.avctx, AV_LOG_ERROR, "Progressive Segmented Frame mode: not supported (yet)\n");
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1019 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1020 }
4486
1d2320afa864 B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents: 4485
diff changeset
1021 v->s.max_b_frames = v->s.avctx->max_b_frames = 7;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1022 if(get_bits1(gb)) { //Display Info - decoding is not affected by it
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1023 int w, h, ar = 0;
4467
a9f64d2a2e69 These messages are just for debug purposes
kostya
parents: 4466
diff changeset
1024 av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n");
8584
8a47574d9fbc VC-1 display dimensions should affect coded dimensions only (I think)
kostya
parents: 8583
diff changeset
1025 v->s.avctx->coded_width = w = get_bits(gb, 14) + 1;
8a47574d9fbc VC-1 display dimensions should affect coded dimensions only (I think)
kostya
parents: 8583
diff changeset
1026 v->s.avctx->coded_height = h = get_bits(gb, 14) + 1;
4467
a9f64d2a2e69 These messages are just for debug purposes
kostya
parents: 4466
diff changeset
1027 av_log(v->s.avctx, AV_LOG_DEBUG, "Display dimensions: %ix%i\n", w, h);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1028 if(get_bits1(gb))
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1029 ar = get_bits(gb, 4);
4414
7c42c51b1130 Set aspect ratio if present (for AP only)
kostya
parents: 4402
diff changeset
1030 if(ar && ar < 14){
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1031 v->s.avctx->sample_aspect_ratio = ff_vc1_pixel_aspect[ar];
4414
7c42c51b1130 Set aspect ratio if present (for AP only)
kostya
parents: 4402
diff changeset
1032 }else if(ar == 15){
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1033 w = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1034 h = get_bits(gb, 8);
4414
7c42c51b1130 Set aspect ratio if present (for AP only)
kostya
parents: 4402
diff changeset
1035 v->s.avctx->sample_aspect_ratio = (AVRational){w, h};
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1036 }
8583
d94775e24b0e Print VC-1 aspect ratio in debug
kostya
parents: 8582
diff changeset
1037 av_log(v->s.avctx, AV_LOG_DEBUG, "Aspect: %i:%i\n", v->s.avctx->sample_aspect_ratio.num, v->s.avctx->sample_aspect_ratio.den);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1038
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1039 if(get_bits1(gb)){ //framerate stuff
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1040 if(get_bits1(gb)) {
4470
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
1041 v->s.avctx->time_base.num = 32;
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
1042 v->s.avctx->time_base.den = get_bits(gb, 16) + 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1043 } else {
4470
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
1044 int nr, dr;
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
1045 nr = get_bits(gb, 8);
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
1046 dr = get_bits(gb, 4);
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
1047 if(nr && nr < 8 && dr && dr < 3){
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1048 v->s.avctx->time_base.num = ff_vc1_fps_dr[dr - 1];
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1049 v->s.avctx->time_base.den = ff_vc1_fps_nr[nr - 1] * 1000;
4470
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
1050 }
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1051 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1052 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1053
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1054 if(get_bits1(gb)){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1055 v->color_prim = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1056 v->transfer_char = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1057 v->matrix_coef = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1058 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1059 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1060
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1061 v->hrd_param_flag = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1062 if(v->hrd_param_flag) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1063 int i;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1064 v->hrd_num_leaky_buckets = get_bits(gb, 5);
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1065 skip_bits(gb, 4); //bitrate exponent
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1066 skip_bits(gb, 4); //buffer size exponent
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1067 for(i = 0; i < v->hrd_num_leaky_buckets; i++) {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1068 skip_bits(gb, 16); //hrd_rate[n]
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1069 skip_bits(gb, 16); //hrd_buffer[n]
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1070 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1071 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1072 return 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1073 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1074
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1075 static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1076 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1077 VC1Context *v = avctx->priv_data;
8692
48442253aac2 Record B-fraction index from frame header and two fields from entry point structure
kostya
parents: 8685
diff changeset
1078 int i;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1079
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1080 av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32));
8692
48442253aac2 Record B-fraction index from frame header and two fields from entry point structure
kostya
parents: 8685
diff changeset
1081 v->broken_link = get_bits1(gb);
48442253aac2 Record B-fraction index from frame header and two fields from entry point structure
kostya
parents: 8685
diff changeset
1082 v->closed_entry = get_bits1(gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1083 v->panscanflag = get_bits1(gb);
8556
ce9d640decd1 Add refdist_flag to VC1Context.
cehoyos
parents: 8152
diff changeset
1084 v->refdist_flag = get_bits1(gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1085 v->s.loop_filter = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1086 v->fastuvmc = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1087 v->extended_mv = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1088 v->dquant = get_bits(gb, 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1089 v->vstransform = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1090 v->overlap = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1091 v->quantizer_mode = get_bits(gb, 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1092
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1093 if(v->hrd_param_flag){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1094 for(i = 0; i < v->hrd_num_leaky_buckets; i++) {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1095 skip_bits(gb, 8); //hrd_full[n]
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1096 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1097 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1098
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1099 if(get_bits1(gb)){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1100 avctx->coded_width = (get_bits(gb, 12)+1)<<1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1101 avctx->coded_height = (get_bits(gb, 12)+1)<<1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1102 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1103 if(v->extended_mv)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1104 v->extended_dmv = get_bits1(gb);
8560
a683a89503eb Fill range_map* in VC1Context.
cehoyos
parents: 8556
diff changeset
1105 if((v->range_mapy_flag = get_bits1(gb))) {
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1106 av_log(avctx, AV_LOG_ERROR, "Luma scaling is not supported, expect wrong picture\n");
8560
a683a89503eb Fill range_map* in VC1Context.
cehoyos
parents: 8556
diff changeset
1107 v->range_mapy = get_bits(gb, 3);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1108 }
8560
a683a89503eb Fill range_map* in VC1Context.
cehoyos
parents: 8556
diff changeset
1109 if((v->range_mapuv_flag = get_bits1(gb))) {
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1110 av_log(avctx, AV_LOG_ERROR, "Chroma scaling is not supported, expect wrong picture\n");
8560
a683a89503eb Fill range_map* in VC1Context.
cehoyos
parents: 8556
diff changeset
1111 v->range_mapuv = get_bits(gb, 3);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1112 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1113
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1114 av_log(avctx, AV_LOG_DEBUG, "Entry point info:\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1115 "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1116 "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1117 "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n",
8692
48442253aac2 Record B-fraction index from frame header and two fields from entry point structure
kostya
parents: 8685
diff changeset
1118 v->broken_link, v->closed_entry, v->panscanflag, v->refdist_flag, v->s.loop_filter,
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1119 v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode);
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1120
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1121 return 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1122 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1123
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1124 static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1125 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1126 int pqindex, lowquant, status;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1127
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1128 if(v->finterpflag) v->interpfrm = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1129 skip_bits(gb, 2); //framecnt unused
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1130 v->rangeredfrm = 0;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1131 if (v->rangered) v->rangeredfrm = get_bits1(gb);
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1132 v->s.pict_type = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1133 if (v->s.avctx->max_b_frames) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1134 if (!v->s.pict_type) {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1135 if (get_bits1(gb)) v->s.pict_type = FF_I_TYPE;
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1136 else v->s.pict_type = FF_B_TYPE;
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1137 } else v->s.pict_type = FF_P_TYPE;
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1138 } else v->s.pict_type = v->s.pict_type ? FF_P_TYPE : FF_I_TYPE;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1139
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1140 v->bi_type = 0;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1141 if(v->s.pict_type == FF_B_TYPE) {
8692
48442253aac2 Record B-fraction index from frame header and two fields from entry point structure
kostya
parents: 8685
diff changeset
1142 v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
48442253aac2 Record B-fraction index from frame header and two fields from entry point structure
kostya
parents: 8685
diff changeset
1143 v->bfraction = ff_vc1_bfraction_lut[v->bfraction_lut_index];
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1144 if(v->bfraction == 0) {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1145 v->s.pict_type = FF_BI_TYPE;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1146 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1147 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1148 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1149 skip_bits(gb, 7); // skip buffer fullness
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1150
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1151 /* calculate RND */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1152 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1153 v->rnd = 1;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1154 if(v->s.pict_type == FF_P_TYPE)
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1155 v->rnd ^= 1;
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1156
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1157 /* Quantizer stuff */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1158 pqindex = get_bits(gb, 5);
6150
49a4e4d78692 pqindex=0 is forbidden
kostya
parents: 6145
diff changeset
1159 if(!pqindex) return -1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1160 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1161 v->pq = ff_vc1_pquant_table[0][pqindex];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1162 else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1163 v->pq = ff_vc1_pquant_table[1][pqindex];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1164
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
1165 v->pquantizer = 1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1166 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1167 v->pquantizer = pqindex < 9;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
1168 if (v->quantizer_mode == QUANT_NON_UNIFORM)
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
1169 v->pquantizer = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1170 v->pqindex = pqindex;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1171 if (pqindex < 9) v->halfpq = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1172 else v->halfpq = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1173 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1174 v->pquantizer = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1175 v->dquantfrm = 0;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1176 if (v->extended_mv == 1) v->mvrange = get_unary(gb, 0, 3);
3452
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1177 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1178 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1179 v->range_x = 1 << (v->k_x - 1);
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1180 v->range_y = 1 << (v->k_y - 1);
8640
ad979489c6e7 Remove the block with always false condition from vc1_parse_frame_header()
kostya
parents: 8639
diff changeset
1181 if (v->multires && v->s.pict_type != FF_B_TYPE) v->respic = get_bits(gb, 2);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1182
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1183 if(v->res_x8 && (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)){
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
1184 v->x8_type = get_bits1(gb);
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
1185 }else v->x8_type = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1186 //av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n",
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1187 // (v->s.pict_type == FF_P_TYPE) ? 'P' : ((v->s.pict_type == FF_I_TYPE) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm);
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1188
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1189 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_P_TYPE) v->use_ic = 0;
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1190
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1191 switch(v->s.pict_type) {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1192 case FF_P_TYPE:
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1193 if (v->pq < 5) v->tt_index = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1194 else if(v->pq < 13) v->tt_index = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1195 else v->tt_index = 2;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1196
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1197 lowquant = (v->pq > 12) ? 0 : 1;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1198 v->mv_mode = ff_vc1_mv_pmode_table[lowquant][get_unary(gb, 1, 4)];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1199 if (v->mv_mode == MV_PMODE_INTENSITY_COMP)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1200 {
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1201 int scale, shift, i;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1202 v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1203 v->lumscale = get_bits(gb, 6);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1204 v->lumshift = get_bits(gb, 6);
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1205 v->use_ic = 1;
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1206 /* fill lookup tables for intensity compensation */
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1207 if(!v->lumscale) {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1208 scale = -64;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1209 shift = (255 - v->lumshift * 2) << 6;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1210 if(v->lumshift > 31)
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1211 shift += 128 << 6;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1212 } else {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1213 scale = v->lumscale + 32;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1214 if(v->lumshift > 31)
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1215 shift = (v->lumshift - 64) << 6;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1216 else
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1217 shift = v->lumshift << 6;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1218 }
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1219 for(i = 0; i < 256; i++) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4518
diff changeset
1220 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4518
diff changeset
1221 v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6);
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1222 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1223 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1224 if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1225 v->s.quarter_sample = 0;
3401
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1226 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1227 if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1228 v->s.quarter_sample = 0;
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1229 else
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1230 v->s.quarter_sample = 1;
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1231 } else
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1232 v->s.quarter_sample = 1;
3523
7407a264d243 Set MpegEncContext->mspel flag (here it indicates that bicubic MC will be use)
kostya
parents: 3522
diff changeset
1233 v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN));
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1234
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1235 if ((v->mv_mode == MV_PMODE_INTENSITY_COMP &&
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1236 v->mv_mode2 == MV_PMODE_MIXED_MV)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1237 || v->mv_mode == MV_PMODE_MIXED_MV)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1238 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1239 status = bitplane_decoding(v->mv_type_mb_plane, &v->mv_type_is_raw, v);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1240 if (status < 0) return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1241 av_log(v->s.avctx, AV_LOG_DEBUG, "MB MV Type plane encoding: "
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1242 "Imode: %i, Invert: %i\n", status>>1, status&1);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1243 } else {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1244 v->mv_type_is_raw = 0;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1245 memset(v->mv_type_mb_plane, 0, v->s.mb_stride * v->s.mb_height);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1246 }
3375
a1c2e1603be9 Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents: 3371
diff changeset
1247 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1248 if (status < 0) return -1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1249 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1250 "Imode: %i, Invert: %i\n", status>>1, status&1);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1251
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1252 /* Hopefully this is correct for P frames */
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1253 v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1254 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1255
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1256 if (v->dquant)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1257 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1258 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1259 vop_dquant_decoding(v);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1260 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1261
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1262 v->ttfrm = 0; //FIXME Is that so ?
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1263 if (v->vstransform)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1264 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1265 v->ttmbf = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1266 if (v->ttmbf)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1267 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1268 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1269 }
3506
e0996476198b Set correctly quantizer and transform mode when parsing frame header.
kostya
parents: 3476
diff changeset
1270 } else {
e0996476198b Set correctly quantizer and transform mode when parsing frame header.
kostya
parents: 3476
diff changeset
1271 v->ttmbf = 1;
e0996476198b Set correctly quantizer and transform mode when parsing frame header.
kostya
parents: 3476
diff changeset
1272 v->ttfrm = TT_8X8;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1273 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1274 break;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1275 case FF_B_TYPE:
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1276 if (v->pq < 5) v->tt_index = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1277 else if(v->pq < 13) v->tt_index = 1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1278 else v->tt_index = 2;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1279
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1280 lowquant = (v->pq > 12) ? 0 : 1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1281 v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1282 v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV);
3523
7407a264d243 Set MpegEncContext->mspel flag (here it indicates that bicubic MC will be use)
kostya
parents: 3522
diff changeset
1283 v->s.mspel = v->s.quarter_sample;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1284
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1285 status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1286 if (status < 0) return -1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1287 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Direct Type plane encoding: "
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1288 "Imode: %i, Invert: %i\n", status>>1, status&1);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1289 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1290 if (status < 0) return -1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1291 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1292 "Imode: %i, Invert: %i\n", status>>1, status&1);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1293
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1294 v->s.mv_table_index = get_bits(gb, 2);
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1295 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)];
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1296
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1297 if (v->dquant)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1298 {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1299 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1300 vop_dquant_decoding(v);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1301 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1302
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1303 v->ttfrm = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1304 if (v->vstransform)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1305 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1306 v->ttmbf = get_bits1(gb);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1307 if (v->ttmbf)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1308 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1309 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1310 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1311 } else {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1312 v->ttmbf = 1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1313 v->ttfrm = TT_8X8;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1314 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1315 break;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1316 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1317
5892
efc1e9a01671 indention
michael
parents: 5887
diff changeset
1318 if(!v->x8_type)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1319 {
5892
efc1e9a01671 indention
michael
parents: 5887
diff changeset
1320 /* AC Syntax */
efc1e9a01671 indention
michael
parents: 5887
diff changeset
1321 v->c_ac_table_index = decode012(gb);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1322 if (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)
5892
efc1e9a01671 indention
michael
parents: 5887
diff changeset
1323 {
efc1e9a01671 indention
michael
parents: 5887
diff changeset
1324 v->y_ac_table_index = decode012(gb);
efc1e9a01671 indention
michael
parents: 5887
diff changeset
1325 }
efc1e9a01671 indention
michael
parents: 5887
diff changeset
1326 /* DC Syntax */
efc1e9a01671 indention
michael
parents: 5887
diff changeset
1327 v->s.dc_table_index = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1328 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1329
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1330 if(v->s.pict_type == FF_BI_TYPE) {
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1331 v->s.pict_type = FF_B_TYPE;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1332 v->bi_type = 1;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1333 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1334 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1335 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1336
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1337 static int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1338 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1339 int pqindex, lowquant;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1340 int status;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1341
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1342 v->p_frame_skipped = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1343
4487
0a0a9f0c9c2d Progressive frames disguised as interlaced are supported
kostya
parents: 4486
diff changeset
1344 if(v->interlace){
4471
cfbd1f3d457c Save frame header info in context variables
kostya
parents: 4470
diff changeset
1345 v->fcm = decode012(gb);
4487
0a0a9f0c9c2d Progressive frames disguised as interlaced are supported
kostya
parents: 4486
diff changeset
1346 if(v->fcm) return -1; // interlaced frames/fields are not implemented
0a0a9f0c9c2d Progressive frames disguised as interlaced are supported
kostya
parents: 4486
diff changeset
1347 }
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1348 switch(get_unary(gb, 0, 4)) {
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1349 case 0:
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1350 v->s.pict_type = FF_P_TYPE;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1351 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1352 case 1:
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1353 v->s.pict_type = FF_B_TYPE;
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1354 break;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1355 case 2:
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1356 v->s.pict_type = FF_I_TYPE;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1357 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1358 case 3:
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1359 v->s.pict_type = FF_BI_TYPE;
3693
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1360 break;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1361 case 4:
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1362 v->s.pict_type = FF_P_TYPE; // skipped pic
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1363 v->p_frame_skipped = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1364 return 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1365 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1366 if(v->tfcntrflag)
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1367 skip_bits(gb, 8);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1368 if(v->broadcast) {
4485
81a120f5f8d0 Wrong flag tested
kostya
parents: 4474
diff changeset
1369 if(!v->interlace || v->psf) {
4471
cfbd1f3d457c Save frame header info in context variables
kostya
parents: 4470
diff changeset
1370 v->rptfrm = get_bits(gb, 2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1371 } else {
4471
cfbd1f3d457c Save frame header info in context variables
kostya
parents: 4470
diff changeset
1372 v->tff = get_bits1(gb);
cfbd1f3d457c Save frame header info in context variables
kostya
parents: 4470
diff changeset
1373 v->rptfrm = get_bits1(gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1374 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1375 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1376 if(v->panscanflag) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1377 //...
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1378 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1379 v->rnd = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1380 if(v->interlace)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1381 v->uvsamp = get_bits1(gb);
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1382 if(v->finterpflag) v->interpfrm = get_bits1(gb);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1383 if(v->s.pict_type == FF_B_TYPE) {
8692
48442253aac2 Record B-fraction index from frame header and two fields from entry point structure
kostya
parents: 8685
diff changeset
1384 v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
48442253aac2 Record B-fraction index from frame header and two fields from entry point structure
kostya
parents: 8685
diff changeset
1385 v->bfraction = ff_vc1_bfraction_lut[v->bfraction_lut_index];
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1386 if(v->bfraction == 0) {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1387 v->s.pict_type = FF_BI_TYPE; /* XXX: should not happen here */
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1388 }
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1389 }
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1390 pqindex = get_bits(gb, 5);
6150
49a4e4d78692 pqindex=0 is forbidden
kostya
parents: 6145
diff changeset
1391 if(!pqindex) return -1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1392 v->pqindex = pqindex;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1393 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1394 v->pq = ff_vc1_pquant_table[0][pqindex];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1395 else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1396 v->pq = ff_vc1_pquant_table[1][pqindex];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1397
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1398 v->pquantizer = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1399 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1400 v->pquantizer = pqindex < 9;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1401 if (v->quantizer_mode == QUANT_NON_UNIFORM)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1402 v->pquantizer = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1403 v->pqindex = pqindex;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1404 if (pqindex < 9) v->halfpq = get_bits1(gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1405 else v->halfpq = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1406 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1407 v->pquantizer = get_bits1(gb);
8152
cddc3677e7dc 421l: postproc flag may be present in any VC-1 AP frame type
kostya
parents: 7846
diff changeset
1408 if(v->postprocflag)
8639
29096719e684 VC-1 postproc field is 2 bits wide while decoder read only single bit.
kostya
parents: 8632
diff changeset
1409 v->postproc = get_bits(gb, 2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1410
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1411 if(v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_P_TYPE) v->use_ic = 0;
4518
e3c43b4aa9ac Intensity compensation for B-frames in AP was missing
kostya
parents: 4487
diff changeset
1412
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1413 switch(v->s.pict_type) {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1414 case FF_I_TYPE:
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1415 case FF_BI_TYPE:
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1416 status = bitplane_decoding(v->acpred_plane, &v->acpred_is_raw, v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1417 if (status < 0) return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1418 av_log(v->s.avctx, AV_LOG_DEBUG, "ACPRED plane encoding: "
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1419 "Imode: %i, Invert: %i\n", status>>1, status&1);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1420 v->condover = CONDOVER_NONE;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1421 if(v->overlap && v->pq <= 8) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1422 v->condover = decode012(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1423 if(v->condover == CONDOVER_SELECT) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1424 status = bitplane_decoding(v->over_flags_plane, &v->overflg_is_raw, v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1425 if (status < 0) return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1426 av_log(v->s.avctx, AV_LOG_DEBUG, "CONDOVER plane encoding: "
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1427 "Imode: %i, Invert: %i\n", status>>1, status&1);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1428 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1429 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1430 break;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1431 case FF_P_TYPE:
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1432 if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1433 else v->mvrange = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1434 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1435 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1436 v->range_x = 1 << (v->k_x - 1);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1437 v->range_y = 1 << (v->k_y - 1);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1438
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1439 if (v->pq < 5) v->tt_index = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1440 else if(v->pq < 13) v->tt_index = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1441 else v->tt_index = 2;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1442
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1443 lowquant = (v->pq > 12) ? 0 : 1;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1444 v->mv_mode = ff_vc1_mv_pmode_table[lowquant][get_unary(gb, 1, 4)];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1445 if (v->mv_mode == MV_PMODE_INTENSITY_COMP)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1446 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1447 int scale, shift, i;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1448 v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1449 v->lumscale = get_bits(gb, 6);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1450 v->lumshift = get_bits(gb, 6);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1451 /* fill lookup tables for intensity compensation */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1452 if(!v->lumscale) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1453 scale = -64;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1454 shift = (255 - v->lumshift * 2) << 6;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1455 if(v->lumshift > 31)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1456 shift += 128 << 6;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1457 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1458 scale = v->lumscale + 32;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1459 if(v->lumshift > 31)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1460 shift = (v->lumshift - 64) << 6;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1461 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1462 shift = v->lumshift << 6;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1463 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1464 for(i = 0; i < 256; i++) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4518
diff changeset
1465 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4518
diff changeset
1466 v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1467 }
4518
e3c43b4aa9ac Intensity compensation for B-frames in AP was missing
kostya
parents: 4487
diff changeset
1468 v->use_ic = 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1469 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1470 if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1471 v->s.quarter_sample = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1472 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1473 if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1474 v->s.quarter_sample = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1475 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1476 v->s.quarter_sample = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1477 } else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1478 v->s.quarter_sample = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1479 v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN));
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1480
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1481 if ((v->mv_mode == MV_PMODE_INTENSITY_COMP &&
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1482 v->mv_mode2 == MV_PMODE_MIXED_MV)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1483 || v->mv_mode == MV_PMODE_MIXED_MV)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1484 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1485 status = bitplane_decoding(v->mv_type_mb_plane, &v->mv_type_is_raw, v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1486 if (status < 0) return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1487 av_log(v->s.avctx, AV_LOG_DEBUG, "MB MV Type plane encoding: "
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1488 "Imode: %i, Invert: %i\n", status>>1, status&1);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1489 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1490 v->mv_type_is_raw = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1491 memset(v->mv_type_mb_plane, 0, v->s.mb_stride * v->s.mb_height);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1492 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1493 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1494 if (status < 0) return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1495 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1496 "Imode: %i, Invert: %i\n", status>>1, status&1);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1497
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1498 /* Hopefully this is correct for P frames */
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1499 v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1500 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1501 if (v->dquant)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1502 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1503 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1504 vop_dquant_decoding(v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1505 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1506
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1507 v->ttfrm = 0; //FIXME Is that so ?
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1508 if (v->vstransform)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1509 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1510 v->ttmbf = get_bits1(gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1511 if (v->ttmbf)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1512 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1513 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1514 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1515 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1516 v->ttmbf = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1517 v->ttfrm = TT_8X8;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1518 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1519 break;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1520 case FF_B_TYPE:
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1521 if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3);
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1522 else v->mvrange = 0;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1523 v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1524 v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1525 v->range_x = 1 << (v->k_x - 1);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1526 v->range_y = 1 << (v->k_y - 1);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1527
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1528 if (v->pq < 5) v->tt_index = 0;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1529 else if(v->pq < 13) v->tt_index = 1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1530 else v->tt_index = 2;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1531
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1532 lowquant = (v->pq > 12) ? 0 : 1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1533 v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1534 v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1535 v->s.mspel = v->s.quarter_sample;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1536
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1537 status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1538 if (status < 0) return -1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1539 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Direct Type plane encoding: "
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1540 "Imode: %i, Invert: %i\n", status>>1, status&1);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1541 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1542 if (status < 0) return -1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1543 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1544 "Imode: %i, Invert: %i\n", status>>1, status&1);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1545
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1546 v->s.mv_table_index = get_bits(gb, 2);
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1547 v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)];
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1548
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1549 if (v->dquant)
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1550 {
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1551 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1552 vop_dquant_decoding(v);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1553 }
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1554
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1555 v->ttfrm = 0;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1556 if (v->vstransform)
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1557 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1558 v->ttmbf = get_bits1(gb);
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1559 if (v->ttmbf)
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1560 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1561 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1562 }
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1563 } else {
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1564 v->ttmbf = 1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1565 v->ttfrm = TT_8X8;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1566 }
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1567 break;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1568 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1569
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1570 /* AC Syntax */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1571 v->c_ac_table_index = decode012(gb);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1572 if (v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE)
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1573 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1574 v->y_ac_table_index = decode012(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1575 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1576 /* DC Syntax */
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1577 v->s.dc_table_index = get_bits1(gb);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1578 if ((v->s.pict_type == FF_I_TYPE || v->s.pict_type == FF_BI_TYPE) && v->dquant) {
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1579 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1580 vop_dquant_decoding(v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1581 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1582
3693
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1583 v->bi_type = 0;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1584 if(v->s.pict_type == FF_BI_TYPE) {
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
1585 v->s.pict_type = FF_B_TYPE;
3693
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1586 v->bi_type = 1;
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1587 }
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1588 return 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1589 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1590
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1591 /***********************************************************************/
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1592 /**
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
1593 * @defgroup vc1block VC-1 Block-level functions
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1594 * @see 7.1.4, p91 and 8.1.1.7, p(1)04
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1595 * @{
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1596 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1597
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1598 /**
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1599 * @def GET_MQUANT
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1600 * @brief Get macroblock-level quantizer scale
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1601 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1602 #define GET_MQUANT() \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1603 if (v->dquantfrm) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1604 { \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1605 int edges = 0; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1606 if (v->dqprofile == DQPROFILE_ALL_MBS) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1607 { \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1608 if (v->dqbilevel) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1609 { \
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1610 mquant = (get_bits1(gb)) ? v->altpq : v->pq; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1611 } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1612 else \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1613 { \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1614 mqdiff = get_bits(gb, 3); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1615 if (mqdiff != 7) mquant = v->pq + mqdiff; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1616 else mquant = get_bits(gb, 5); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1617 } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1618 } \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1619 if(v->dqprofile == DQPROFILE_SINGLE_EDGE) \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1620 edges = 1 << v->dqsbedge; \
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1621 else if(v->dqprofile == DQPROFILE_DOUBLE_EDGES) \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1622 edges = (3 << v->dqsbedge) % 15; \
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1623 else if(v->dqprofile == DQPROFILE_FOUR_EDGES) \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1624 edges = 15; \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1625 if((edges&1) && !s->mb_x) \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1626 mquant = v->altpq; \
3451
45724ba8d666 Fix mquant selection for ALL_MBS mode
kostya
parents: 3450
diff changeset
1627 if((edges&2) && s->first_slice_line) \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1628 mquant = v->altpq; \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1629 if((edges&4) && s->mb_x == (s->mb_width - 1)) \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1630 mquant = v->altpq; \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1631 if((edges&8) && s->mb_y == (s->mb_height - 1)) \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1632 mquant = v->altpq; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1633 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1634
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1635 /**
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1636 * @def GET_MVDATA(_dmv_x, _dmv_y)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1637 * @brief Get MV differentials
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1638 * @see MVDATA decoding from 8.3.5.2, p(1)20
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1639 * @param _dmv_x Horizontal differential for decoded MV
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1640 * @param _dmv_y Vertical differential for decoded MV
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1641 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1642 #define GET_MVDATA(_dmv_x, _dmv_y) \
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1643 index = 1 + get_vlc2(gb, ff_vc1_mv_diff_vlc[s->mv_table_index].table,\
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1644 VC1_MV_DIFF_VLC_BITS, 2); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1645 if (index > 36) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1646 { \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1647 mb_has_coeffs = 1; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1648 index -= 37; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1649 } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1650 else mb_has_coeffs = 0; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1651 s->mb_intra = 0; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1652 if (!index) { _dmv_x = _dmv_y = 0; } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1653 else if (index == 35) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1654 { \
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1655 _dmv_x = get_bits(gb, v->k_x - 1 + s->quarter_sample); \
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1656 _dmv_y = get_bits(gb, v->k_y - 1 + s->quarter_sample); \
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1657 } \
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1658 else if (index == 36) \
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1659 { \
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1660 _dmv_x = 0; \
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1661 _dmv_y = 0; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1662 s->mb_intra = 1; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1663 } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1664 else \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1665 { \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1666 index1 = index%6; \
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1667 if (!s->quarter_sample && index1 == 5) val = 1; \
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1668 else val = 0; \
3366
c59aa4cdf042 This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents: 3364
diff changeset
1669 if(size_table[index1] - val > 0) \
c59aa4cdf042 This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents: 3364
diff changeset
1670 val = get_bits(gb, size_table[index1] - val); \
c59aa4cdf042 This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents: 3364
diff changeset
1671 else val = 0; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1672 sign = 0 - (val&1); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1673 _dmv_x = (sign ^ ((val>>1) + offset_table[index1])) - sign; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1674 \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1675 index1 = index/6; \
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1676 if (!s->quarter_sample && index1 == 5) val = 1; \
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1677 else val = 0; \
3366
c59aa4cdf042 This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents: 3364
diff changeset
1678 if(size_table[index1] - val > 0) \
c59aa4cdf042 This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents: 3364
diff changeset
1679 val = get_bits(gb, size_table[index1] - val); \
c59aa4cdf042 This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents: 3364
diff changeset
1680 else val = 0; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1681 sign = 0 - (val&1); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1682 _dmv_y = (sign ^ ((val>>1) + offset_table[index1])) - sign; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1683 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1684
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1685 /** Predict and set motion vector
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1686 */
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1687 static inline void vc1_pred_mv(MpegEncContext *s, int n, int dmv_x, int dmv_y, int mv1, int r_x, int r_y, uint8_t* is_intra)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1688 {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1689 int xy, wrap, off = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1690 int16_t *A, *B, *C;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1691 int px, py;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1692 int sum;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1693
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1694 /* scale MV difference to be quad-pel */
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1695 dmv_x <<= 1 - s->quarter_sample;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1696 dmv_y <<= 1 - s->quarter_sample;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1697
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1698 wrap = s->b8_stride;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1699 xy = s->block_index[n];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1700
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1701 if(s->mb_intra){
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1702 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1703 s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = 0;
4683
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1704 s->current_picture.motion_val[1][xy][0] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1705 s->current_picture.motion_val[1][xy][1] = 0;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1706 if(mv1) { /* duplicate motion data for 1-MV block */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1707 s->current_picture.motion_val[0][xy + 1][0] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1708 s->current_picture.motion_val[0][xy + 1][1] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1709 s->current_picture.motion_val[0][xy + wrap][0] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1710 s->current_picture.motion_val[0][xy + wrap][1] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1711 s->current_picture.motion_val[0][xy + wrap + 1][0] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1712 s->current_picture.motion_val[0][xy + wrap + 1][1] = 0;
4683
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1713 s->current_picture.motion_val[1][xy + 1][0] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1714 s->current_picture.motion_val[1][xy + 1][1] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1715 s->current_picture.motion_val[1][xy + wrap][0] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1716 s->current_picture.motion_val[1][xy + wrap][1] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1717 s->current_picture.motion_val[1][xy + wrap + 1][0] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1718 s->current_picture.motion_val[1][xy + wrap + 1][1] = 0;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1719 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1720 return;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1721 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1722
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1723 C = s->current_picture.motion_val[0][xy - 1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1724 A = s->current_picture.motion_val[0][xy - wrap];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1725 if(mv1)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1726 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 2;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1727 else {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1728 //in 4-MV mode different blocks have different B predictor position
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1729 switch(n){
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1730 case 0:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1731 off = (s->mb_x > 0) ? -1 : 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1732 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1733 case 1:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1734 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1735 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1736 case 2:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1737 off = 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1738 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1739 case 3:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1740 off = -1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1741 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1742 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1743 B = s->current_picture.motion_val[0][xy - wrap + off];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1744
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1745 if(!s->first_slice_line || (n==2 || n==3)) { // predictor A is not out of bounds
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1746 if(s->mb_width == 1) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1747 px = A[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1748 py = A[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1749 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1750 px = mid_pred(A[0], B[0], C[0]);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1751 py = mid_pred(A[1], B[1], C[1]);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1752 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1753 } else if(s->mb_x || (n==1 || n==3)) { // predictor C is not out of bounds
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1754 px = C[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1755 py = C[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1756 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1757 px = py = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1758 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1759 /* Pullback MV as specified in 8.3.5.3.4 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1760 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1761 int qx, qy, X, Y;
3400
84de54d536bd 4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents: 3399
diff changeset
1762 qx = (s->mb_x << 6) + ((n==1 || n==3) ? 32 : 0);
84de54d536bd 4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents: 3399
diff changeset
1763 qy = (s->mb_y << 6) + ((n==2 || n==3) ? 32 : 0);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1764 X = (s->mb_width << 6) - 4;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1765 Y = (s->mb_height << 6) - 4;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1766 if(mv1) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1767 if(qx + px < -60) px = -60 - qx;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1768 if(qy + py < -60) py = -60 - qy;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1769 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1770 if(qx + px < -28) px = -28 - qx;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1771 if(qy + py < -28) py = -28 - qy;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1772 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1773 if(qx + px > X) px = X - qx;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1774 if(qy + py > Y) py = Y - qy;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1775 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1776 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1777 if((!s->first_slice_line || (n==2 || n==3)) && (s->mb_x || (n==1 || n==3))) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1778 if(is_intra[xy - wrap])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1779 sum = FFABS(px) + FFABS(py);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1780 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1781 sum = FFABS(px - A[0]) + FFABS(py - A[1]);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1782 if(sum > 32) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1783 if(get_bits1(&s->gb)) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1784 px = A[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1785 py = A[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1786 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1787 px = C[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1788 py = C[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1789 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1790 } else {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1791 if(is_intra[xy - 1])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1792 sum = FFABS(px) + FFABS(py);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1793 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1794 sum = FFABS(px - C[0]) + FFABS(py - C[1]);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1795 if(sum > 32) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1796 if(get_bits1(&s->gb)) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1797 px = A[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1798 py = A[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1799 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1800 px = C[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1801 py = C[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1802 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1803 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1804 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1805 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1806 /* store MV using signed modulus of MV range defined in 4.11 */
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1807 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1808 s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = ((py + dmv_y + r_y) & ((r_y << 1) - 1)) - r_y;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1809 if(mv1) { /* duplicate motion data for 1-MV block */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1810 s->current_picture.motion_val[0][xy + 1][0] = s->current_picture.motion_val[0][xy][0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1811 s->current_picture.motion_val[0][xy + 1][1] = s->current_picture.motion_val[0][xy][1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1812 s->current_picture.motion_val[0][xy + wrap][0] = s->current_picture.motion_val[0][xy][0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1813 s->current_picture.motion_val[0][xy + wrap][1] = s->current_picture.motion_val[0][xy][1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1814 s->current_picture.motion_val[0][xy + wrap + 1][0] = s->current_picture.motion_val[0][xy][0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1815 s->current_picture.motion_val[0][xy + wrap + 1][1] = s->current_picture.motion_val[0][xy][1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1816 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1817 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1818
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1819 /** Motion compensation for direct or interpolated blocks in B-frames
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1820 */
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1821 static void vc1_interp_mc(VC1Context *v)
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1822 {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1823 MpegEncContext *s = &v->s;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1824 DSPContext *dsp = &v->s.dsp;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1825 uint8_t *srcY, *srcU, *srcV;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1826 int dxy, uvdxy, mx, my, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1827
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1828 if(!v->s.next_picture.data[0])return;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1829
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1830 mx = s->mv[1][0][0];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1831 my = s->mv[1][0][1];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1832 uvmx = (mx + ((mx & 3) == 3)) >> 1;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1833 uvmy = (my + ((my & 3) == 3)) >> 1;
4258
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
1834 if(v->fastuvmc) {
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
1835 uvmx = uvmx + ((uvmx<0)?-(uvmx&1):(uvmx&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
1836 uvmy = uvmy + ((uvmy<0)?-(uvmy&1):(uvmy&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
1837 }
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1838 srcY = s->next_picture.data[0];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1839 srcU = s->next_picture.data[1];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1840 srcV = s->next_picture.data[2];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1841
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1842 src_x = s->mb_x * 16 + (mx >> 2);
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1843 src_y = s->mb_y * 16 + (my >> 2);
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1844 uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1845 uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1846
4681
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1847 if(v->profile != PROFILE_ADVANCED){
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1848 src_x = av_clip( src_x, -16, s->mb_width * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1849 src_y = av_clip( src_y, -16, s->mb_height * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1850 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1851 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1852 }else{
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1853 src_x = av_clip( src_x, -17, s->avctx->coded_width);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1854 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1855 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1856 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1857 }
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1858
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1859 srcY += src_y * s->linesize + src_x;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1860 srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1861 srcV += uvsrc_y * s->uvlinesize + uvsrc_x;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1862
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1863 /* for grayscale we should not try to read from unknown area */
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1864 if(s->flags & CODEC_FLAG_GRAY) {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1865 srcU = s->edge_emu_buffer + 18 * s->linesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1866 srcV = s->edge_emu_buffer + 18 * s->linesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1867 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1868
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1869 if(v->rangeredfrm
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1870 || (unsigned)src_x > s->h_edge_pos - (mx&3) - 16
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1871 || (unsigned)src_y > s->v_edge_pos - (my&3) - 16){
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1872 uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1873
3708
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1874 srcY -= s->mspel * (1 + s->linesize);
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1875 ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2,
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1876 src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1877 srcY = s->edge_emu_buffer;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1878 ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1,
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1879 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1880 ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1,
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1881 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1882 srcU = uvbuf;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1883 srcV = uvbuf + 16;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1884 /* if we deal with range reduction we need to scale source blocks */
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1885 if(v->rangeredfrm) {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1886 int i, j;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1887 uint8_t *src, *src2;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1888
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1889 src = srcY;
3708
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1890 for(j = 0; j < 17 + s->mspel*2; j++) {
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1891 for(i = 0; i < 17 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1892 src += s->linesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1893 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1894 src = srcU; src2 = srcV;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1895 for(j = 0; j < 9; j++) {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1896 for(i = 0; i < 9; i++) {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1897 src[i] = ((src[i] - 128) >> 1) + 128;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1898 src2[i] = ((src2[i] - 128) >> 1) + 128;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1899 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1900 src += s->uvlinesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1901 src2 += s->uvlinesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1902 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1903 }
3708
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1904 srcY += s->mspel * (1 + s->linesize);
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1905 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1906
3654
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1907 mx >>= 1;
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1908 my >>= 1;
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1909 dxy = ((my & 1) << 1) | (mx & 1);
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1910
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1911 dsp->avg_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16);
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1912
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1913 if(s->flags & CODEC_FLAG_GRAY) return;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1914 /* Chroma MC always uses qpel blilinear */
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1915 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3);
3709
44f5de5a7d03 Use h264_chroma funcs in B-frames MC too
kostya
parents: 3708
diff changeset
1916 uvmx = (uvmx&3)<<1;
44f5de5a7d03 Use h264_chroma funcs in B-frames MC too
kostya
parents: 3708
diff changeset
1917 uvmy = (uvmy&3)<<1;
44f5de5a7d03 Use h264_chroma funcs in B-frames MC too
kostya
parents: 3708
diff changeset
1918 dsp->avg_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
44f5de5a7d03 Use h264_chroma funcs in B-frames MC too
kostya
parents: 3708
diff changeset
1919 dsp->avg_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1920 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1921
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4258
diff changeset
1922 static av_always_inline int scale_mv(int value, int bfrac, int inv, int qs)
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1923 {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1924 int n = bfrac;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1925
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1926 #if B_FRACTION_DEN==256
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1927 if(inv)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1928 n -= 256;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1929 if(!qs)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1930 return 2 * ((value * n + 255) >> 9);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1931 return (value * n + 128) >> 8;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1932 #else
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1933 if(inv)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1934 n -= B_FRACTION_DEN;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1935 if(!qs)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1936 return 2 * ((value * n + B_FRACTION_DEN - 1) / (2 * B_FRACTION_DEN));
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1937 return (value * n + B_FRACTION_DEN/2) / B_FRACTION_DEN;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1938 #endif
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1939 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1940
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1941 /** Reconstruct motion vector for B-frame and do motion compensation
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1942 */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1943 static inline void vc1_b_mc(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mode)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1944 {
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1945 if(v->use_ic) {
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1946 v->mv_mode2 = v->mv_mode;
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1947 v->mv_mode = MV_PMODE_INTENSITY_COMP;
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1948 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1949 if(direct) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1950 vc1_mc_1mv(v, 0);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1951 vc1_interp_mc(v);
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1952 if(v->use_ic) v->mv_mode = v->mv_mode2;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1953 return;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1954 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1955 if(mode == BMV_TYPE_INTERPOLATED) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1956 vc1_mc_1mv(v, 0);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1957 vc1_interp_mc(v);
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1958 if(v->use_ic) v->mv_mode = v->mv_mode2;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1959 return;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1960 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1961
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1962 if(v->use_ic && (mode == BMV_TYPE_BACKWARD)) v->mv_mode = v->mv_mode2;
3711
4a5536551692 Swap back and forward motion vectors to achieve correct picture
kostya
parents: 3710
diff changeset
1963 vc1_mc_1mv(v, (mode == BMV_TYPE_BACKWARD));
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1964 if(v->use_ic) v->mv_mode = v->mv_mode2;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1965 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1966
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1967 static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mvtype)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1968 {
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1969 MpegEncContext *s = &v->s;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1970 int xy, wrap, off = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1971 int16_t *A, *B, *C;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1972 int px, py;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1973 int sum;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1974 int r_x, r_y;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1975 const uint8_t *is_intra = v->mb_type[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1976
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1977 r_x = v->range_x;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1978 r_y = v->range_y;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1979 /* scale MV difference to be quad-pel */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1980 dmv_x[0] <<= 1 - s->quarter_sample;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1981 dmv_y[0] <<= 1 - s->quarter_sample;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1982 dmv_x[1] <<= 1 - s->quarter_sample;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1983 dmv_y[1] <<= 1 - s->quarter_sample;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1984
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1985 wrap = s->b8_stride;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1986 xy = s->block_index[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1987
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1988 if(s->mb_intra) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1989 s->current_picture.motion_val[0][xy][0] =
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1990 s->current_picture.motion_val[0][xy][1] =
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1991 s->current_picture.motion_val[1][xy][0] =
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1992 s->current_picture.motion_val[1][xy][1] = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1993 return;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1994 }
3743
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
1995 s->mv[0][0][0] = scale_mv(s->next_picture.motion_val[1][xy][0], v->bfraction, 0, s->quarter_sample);
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
1996 s->mv[0][0][1] = scale_mv(s->next_picture.motion_val[1][xy][1], v->bfraction, 0, s->quarter_sample);
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
1997 s->mv[1][0][0] = scale_mv(s->next_picture.motion_val[1][xy][0], v->bfraction, 1, s->quarter_sample);
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
1998 s->mv[1][0][1] = scale_mv(s->next_picture.motion_val[1][xy][1], v->bfraction, 1, s->quarter_sample);
4859
bc40c297ea15 Pullback should be performed on scaled motion vectors in B-frames
kostya
parents: 4834
diff changeset
1999
bc40c297ea15 Pullback should be performed on scaled motion vectors in B-frames
kostya
parents: 4834
diff changeset
2000 /* Pullback predicted motion vectors as specified in 8.4.5.4 */
bc40c297ea15 Pullback should be performed on scaled motion vectors in B-frames
kostya
parents: 4834
diff changeset
2001 s->mv[0][0][0] = av_clip(s->mv[0][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6));
bc40c297ea15 Pullback should be performed on scaled motion vectors in B-frames
kostya
parents: 4834
diff changeset
2002 s->mv[0][0][1] = av_clip(s->mv[0][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6));
bc40c297ea15 Pullback should be performed on scaled motion vectors in B-frames
kostya
parents: 4834
diff changeset
2003 s->mv[1][0][0] = av_clip(s->mv[1][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6));
bc40c297ea15 Pullback should be performed on scaled motion vectors in B-frames
kostya
parents: 4834
diff changeset
2004 s->mv[1][0][1] = av_clip(s->mv[1][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6));
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
2005 if(direct) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2006 s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2007 s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2008 s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2009 s->current_picture.motion_val[1][xy][1] = s->mv[1][0][1];
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
2010 return;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
2011 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2012
3743
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
2013 if((mvtype == BMV_TYPE_FORWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2014 C = s->current_picture.motion_val[0][xy - 2];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2015 A = s->current_picture.motion_val[0][xy - wrap*2];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2016 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2017 B = s->current_picture.motion_val[0][xy - wrap*2 + off];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2018
4834
300b60dee58c Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents: 4784
diff changeset
2019 if(!s->mb_x) C[0] = C[1] = 0;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2020 if(!s->first_slice_line) { // predictor A is not out of bounds
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2021 if(s->mb_width == 1) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2022 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2023 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2024 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2025 px = mid_pred(A[0], B[0], C[0]);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2026 py = mid_pred(A[1], B[1], C[1]);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2027 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2028 } else if(s->mb_x) { // predictor C is not out of bounds
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2029 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2030 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2031 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2032 px = py = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2033 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2034 /* Pullback MV as specified in 8.3.5.3.4 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2035 {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2036 int qx, qy, X, Y;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2037 if(v->profile < PROFILE_ADVANCED) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2038 qx = (s->mb_x << 5);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2039 qy = (s->mb_y << 5);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2040 X = (s->mb_width << 5) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2041 Y = (s->mb_height << 5) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2042 if(qx + px < -28) px = -28 - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2043 if(qy + py < -28) py = -28 - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2044 if(qx + px > X) px = X - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2045 if(qy + py > Y) py = Y - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2046 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2047 qx = (s->mb_x << 6);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2048 qy = (s->mb_y << 6);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2049 X = (s->mb_width << 6) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2050 Y = (s->mb_height << 6) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2051 if(qx + px < -60) px = -60 - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2052 if(qy + py < -60) py = -60 - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2053 if(qx + px > X) px = X - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2054 if(qy + py > Y) py = Y - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2055 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2056 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2057 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2058 if(0 && !s->first_slice_line && s->mb_x) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2059 if(is_intra[xy - wrap])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2060 sum = FFABS(px) + FFABS(py);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2061 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2062 sum = FFABS(px - A[0]) + FFABS(py - A[1]);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2063 if(sum > 32) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2064 if(get_bits1(&s->gb)) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2065 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2066 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2067 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2068 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2069 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2070 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2071 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2072 if(is_intra[xy - 2])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2073 sum = FFABS(px) + FFABS(py);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2074 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2075 sum = FFABS(px - C[0]) + FFABS(py - C[1]);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2076 if(sum > 32) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2077 if(get_bits1(&s->gb)) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2078 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2079 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2080 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2081 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2082 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2083 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2084 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2085 }
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
2086 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2087 /* store MV using signed modulus of MV range defined in 4.11 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2088 s->mv[0][0][0] = ((px + dmv_x[0] + r_x) & ((r_x << 1) - 1)) - r_x;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2089 s->mv[0][0][1] = ((py + dmv_y[0] + r_y) & ((r_y << 1) - 1)) - r_y;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
2090 }
3743
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
2091 if((mvtype == BMV_TYPE_BACKWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2092 C = s->current_picture.motion_val[1][xy - 2];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2093 A = s->current_picture.motion_val[1][xy - wrap*2];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2094 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2095 B = s->current_picture.motion_val[1][xy - wrap*2 + off];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2096
4834
300b60dee58c Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents: 4784
diff changeset
2097 if(!s->mb_x) C[0] = C[1] = 0;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2098 if(!s->first_slice_line) { // predictor A is not out of bounds
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2099 if(s->mb_width == 1) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2100 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2101 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2102 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2103 px = mid_pred(A[0], B[0], C[0]);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2104 py = mid_pred(A[1], B[1], C[1]);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2105 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2106 } else if(s->mb_x) { // predictor C is not out of bounds
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2107 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2108 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2109 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2110 px = py = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2111 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2112 /* Pullback MV as specified in 8.3.5.3.4 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2113 {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2114 int qx, qy, X, Y;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2115 if(v->profile < PROFILE_ADVANCED) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2116 qx = (s->mb_x << 5);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2117 qy = (s->mb_y << 5);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2118 X = (s->mb_width << 5) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2119 Y = (s->mb_height << 5) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2120 if(qx + px < -28) px = -28 - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2121 if(qy + py < -28) py = -28 - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2122 if(qx + px > X) px = X - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2123 if(qy + py > Y) py = Y - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2124 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2125 qx = (s->mb_x << 6);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2126 qy = (s->mb_y << 6);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2127 X = (s->mb_width << 6) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2128 Y = (s->mb_height << 6) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2129 if(qx + px < -60) px = -60 - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2130 if(qy + py < -60) py = -60 - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2131 if(qx + px > X) px = X - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2132 if(qy + py > Y) py = Y - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2133 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2134 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2135 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2136 if(0 && !s->first_slice_line && s->mb_x) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2137 if(is_intra[xy - wrap])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2138 sum = FFABS(px) + FFABS(py);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2139 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2140 sum = FFABS(px - A[0]) + FFABS(py - A[1]);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2141 if(sum > 32) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2142 if(get_bits1(&s->gb)) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2143 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2144 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2145 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2146 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2147 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2148 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2149 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2150 if(is_intra[xy - 2])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2151 sum = FFABS(px) + FFABS(py);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2152 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2153 sum = FFABS(px - C[0]) + FFABS(py - C[1]);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2154 if(sum > 32) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2155 if(get_bits1(&s->gb)) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2156 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2157 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2158 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2159 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2160 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2161 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2162 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2163 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2164 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2165 /* store MV using signed modulus of MV range defined in 4.11 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2166
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2167 s->mv[1][0][0] = ((px + dmv_x[1] + r_x) & ((r_x << 1) - 1)) - r_x;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2168 s->mv[1][0][1] = ((py + dmv_y[1] + r_y) & ((r_y << 1) - 1)) - r_y;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2169 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2170 s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2171 s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2172 s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2173 s->current_picture.motion_val[1][xy][1] = s->mv[1][0][1];
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
2174 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
2175
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2176 /** Get predicted DC value for I-frames only
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2177 * prediction dir: left=0, top=1
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2178 * @param s MpegEncContext
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2179 * @param overlap flag indicating that overlap filtering is used
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2180 * @param pq integer part of picture quantizer
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2181 * @param[in] n block index in the current MB
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2182 * @param dc_val_ptr Pointer to DC predictor
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2183 * @param dir_ptr Prediction direction for use in AC prediction
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2184 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2185 static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2186 int16_t **dc_val_ptr, int *dir_ptr)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2187 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2188 int a, b, c, wrap, pred, scale;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2189 int16_t *dc_val;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2190 static const uint16_t dcpred[32] = {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2191 -1, 1024, 512, 341, 256, 205, 171, 146, 128,
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2192 114, 102, 93, 85, 79, 73, 68, 64,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2193 60, 57, 54, 51, 49, 47, 45, 43,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2194 41, 39, 38, 37, 35, 34, 33
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2195 };
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2196
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2197 /* find prediction - wmv3_dc_scale always used here in fact */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2198 if (n < 4) scale = s->y_dc_scale;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2199 else scale = s->c_dc_scale;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2200
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2201 wrap = s->block_wrap[n];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2202 dc_val= s->dc_val[0] + s->block_index[n];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2203
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2204 /* B A
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2205 * C X
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2206 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2207 c = dc_val[ - 1];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2208 b = dc_val[ - 1 - wrap];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2209 a = dc_val[ - wrap];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2210
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2211 if (pq < 9 || !overlap)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2212 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2213 /* Set outer values */
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
2214 if (s->first_slice_line && (n!=2 && n!=3)) b=a=dcpred[scale];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2215 if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=dcpred[scale];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2216 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2217 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2218 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2219 /* Set outer values */
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
2220 if (s->first_slice_line && (n!=2 && n!=3)) b=a=0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2221 if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2222 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2223
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2224 if (abs(a - b) <= abs(b - c)) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2225 pred = c;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2226 *dir_ptr = 1;//left
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2227 } else {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2228 pred = a;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2229 *dir_ptr = 0;//top
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2230 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2231
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2232 /* update predictor */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2233 *dc_val_ptr = &dc_val[0];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2234 return pred;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2235 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2236
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2237
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2238 /** Get predicted DC value
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2239 * prediction dir: left=0, top=1
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2240 * @param s MpegEncContext
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2241 * @param overlap flag indicating that overlap filtering is used
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2242 * @param pq integer part of picture quantizer
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2243 * @param[in] n block index in the current MB
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2244 * @param a_avail flag indicating top block availability
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2245 * @param c_avail flag indicating left block availability
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2246 * @param dc_val_ptr Pointer to DC predictor
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2247 * @param dir_ptr Prediction direction for use in AC prediction
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2248 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2249 static inline int vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2250 int a_avail, int c_avail,
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2251 int16_t **dc_val_ptr, int *dir_ptr)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2252 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2253 int a, b, c, wrap, pred, scale;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2254 int16_t *dc_val;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2255 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2256 int q1, q2 = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2257
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2258 /* find prediction - wmv3_dc_scale always used here in fact */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2259 if (n < 4) scale = s->y_dc_scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2260 else scale = s->c_dc_scale;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2261
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2262 wrap = s->block_wrap[n];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2263 dc_val= s->dc_val[0] + s->block_index[n];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2264
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2265 /* B A
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2266 * C X
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2267 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2268 c = dc_val[ - 1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2269 b = dc_val[ - 1 - wrap];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2270 a = dc_val[ - wrap];
3508
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2271 /* scale predictors if needed */
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2272 q1 = s->current_picture.qscale_table[mb_pos];
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2273 if(c_avail && (n!= 1 && n!=3)) {
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2274 q2 = s->current_picture.qscale_table[mb_pos - 1];
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2275 if(q2 && q2 != q1)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2276 c = (c * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18;
3508
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2277 }
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2278 if(a_avail && (n!= 2 && n!=3)) {
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2279 q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2280 if(q2 && q2 != q1)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2281 a = (a * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18;
3508
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2282 }
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2283 if(a_avail && c_avail && (n!=3)) {
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2284 int off = mb_pos;
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2285 if(n != 1) off--;
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2286 if(n != 2) off -= s->mb_stride;
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2287 q2 = s->current_picture.qscale_table[off];
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2288 if(q2 && q2 != q1)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2289 b = (b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18;
3508
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2290 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2291
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2292 if(a_avail && c_avail) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2293 if(abs(a - b) <= abs(b - c)) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2294 pred = c;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2295 *dir_ptr = 1;//left
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2296 } else {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2297 pred = a;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2298 *dir_ptr = 0;//top
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2299 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2300 } else if(a_avail) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2301 pred = a;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2302 *dir_ptr = 0;//top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2303 } else if(c_avail) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2304 pred = c;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2305 *dir_ptr = 1;//left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2306 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2307 pred = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2308 *dir_ptr = 1;//left
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2309 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2310
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2311 /* update predictor */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2312 *dc_val_ptr = &dc_val[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2313 return pred;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2314 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2315
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2316 /** @} */ // Block group
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2317
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2318 /**
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2319 * @defgroup vc1_std_mb VC1 Macroblock-level functions in Simple/Main Profiles
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2320 * @see 7.1.4, p91 and 8.1.1.7, p(1)04
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2321 * @{
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2322 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2323
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2324 static inline int vc1_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2325 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2326 int xy, wrap, pred, a, b, c;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2327
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2328 xy = s->block_index[n];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2329 wrap = s->b8_stride;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2330
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2331 /* B C
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2332 * A X
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2333 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2334 a = s->coded_block[xy - 1 ];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2335 b = s->coded_block[xy - 1 - wrap];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2336 c = s->coded_block[xy - wrap];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2337
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2338 if (b == c) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2339 pred = a;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2340 } else {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2341 pred = c;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2342 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2343
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2344 /* store value */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2345 *coded_block_ptr = &s->coded_block[xy];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2346
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2347 return pred;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2348 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2349
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2350 /**
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2351 * Decode one AC coefficient
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2352 * @param v The VC1 context
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2353 * @param last Last coefficient
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2354 * @param skip How much zero coefficients to skip
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2355 * @param value Decoded AC coefficient value
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2356 * @param codingset set of VLC to decode data
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2357 * @see 8.1.3.4
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2358 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2359 static void vc1_decode_ac_coeff(VC1Context *v, int *last, int *skip, int *value, int codingset)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2360 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2361 GetBitContext *gb = &v->s.gb;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2362 int index, escape, run = 0, level = 0, lst = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2363
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2364 index = get_vlc2(gb, ff_vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2365 if (index != vc1_ac_sizes[codingset] - 1) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2366 run = vc1_index_decode_table[codingset][index][0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2367 level = vc1_index_decode_table[codingset][index][1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2368 lst = index >= vc1_last_decode_table[codingset];
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2369 if(get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2370 level = -level;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2371 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2372 escape = decode210(gb);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2373 if (escape != 2) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2374 index = get_vlc2(gb, ff_vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2375 run = vc1_index_decode_table[codingset][index][0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2376 level = vc1_index_decode_table[codingset][index][1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2377 lst = index >= vc1_last_decode_table[codingset];
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2378 if(escape == 0) {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2379 if(lst)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2380 level += vc1_last_delta_level_table[codingset][run];
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2381 else
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2382 level += vc1_delta_level_table[codingset][run];
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2383 } else {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2384 if(lst)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2385 run += vc1_last_delta_run_table[codingset][level] + 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2386 else
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2387 run += vc1_delta_run_table[codingset][level] + 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2388 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2389 if(get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2390 level = -level;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2391 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2392 int sign;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2393 lst = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2394 if(v->s.esc3_level_length == 0) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2395 if(v->pq < 8 || v->dquantfrm) { // table 59
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2396 v->s.esc3_level_length = get_bits(gb, 3);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2397 if(!v->s.esc3_level_length)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2398 v->s.esc3_level_length = get_bits(gb, 2) + 8;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2399 } else { //table 60
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
2400 v->s.esc3_level_length = get_unary(gb, 1, 6) + 2;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2401 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2402 v->s.esc3_run_length = 3 + get_bits(gb, 2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2403 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2404 run = get_bits(gb, v->s.esc3_run_length);
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2405 sign = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2406 level = get_bits(gb, v->s.esc3_level_length);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2407 if(sign)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2408 level = -level;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2409 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2410 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2411
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2412 *last = lst;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2413 *skip = run;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2414 *value = level;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2415 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2416
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2417 /** Decode intra block in intra frames - should be faster than decode_intra_block
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2418 * @param v VC1Context
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2419 * @param block block to decode
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2420 * @param[in] n subblock index
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2421 * @param coded are AC coeffs present or not
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2422 * @param codingset set of VLC to decode data
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2423 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2424 static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded, int codingset)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2425 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2426 GetBitContext *gb = &v->s.gb;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2427 MpegEncContext *s = &v->s;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2428 int dc_pred_dir = 0; /* Direction of the DC prediction used */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2429 int run_diff, i;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2430 int16_t *dc_val;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2431 int16_t *ac_val, *ac_val2;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2432 int dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2433
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2434 /* Get DC differential */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2435 if (n < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2436 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2437 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2438 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2439 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2440 if (dcdiff < 0){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2441 av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2442 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2443 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2444 if (dcdiff)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2445 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2446 if (dcdiff == 119 /* ESC index value */)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2447 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2448 /* TODO: Optimize */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2449 if (v->pq == 1) dcdiff = get_bits(gb, 10);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2450 else if (v->pq == 2) dcdiff = get_bits(gb, 9);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2451 else dcdiff = get_bits(gb, 8);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2452 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2453 else
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2454 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2455 if (v->pq == 1)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2456 dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2457 else if (v->pq == 2)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2458 dcdiff = (dcdiff<<1) + get_bits1(gb) - 1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2459 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2460 if (get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2461 dcdiff = -dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2462 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2463
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2464 /* Prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2465 dcdiff += vc1_i_pred_dc(&v->s, v->overlap, v->pq, n, &dc_val, &dc_pred_dir);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2466 *dc_val = dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2467
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2468 /* Store the quantized DC coeff, used for prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2469 if (n < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2470 block[0] = dcdiff * s->y_dc_scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2471 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2472 block[0] = dcdiff * s->c_dc_scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2473 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2474 /* Skip ? */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2475 run_diff = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2476 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2477 if (!coded) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2478 goto not_coded;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2479 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2480
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2481 //AC Decoding
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2482 i = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2483
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2484 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2485 int last = 0, skip, value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2486 const int8_t *zz_table;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2487 int scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2488 int k;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2489
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2490 scale = v->pq * 2 + v->halfpq;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2491
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2492 if(v->s.ac_pred) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2493 if(!dc_pred_dir)
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
2494 zz_table = wmv1_scantable[2];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2495 else
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
2496 zz_table = wmv1_scantable[3];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2497 } else
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
2498 zz_table = wmv1_scantable[1];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2499
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2500 ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2501 ac_val2 = ac_val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2502 if(dc_pred_dir) //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2503 ac_val -= 16;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2504 else //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2505 ac_val -= 16 * s->block_wrap[n];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2506
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2507 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2508 vc1_decode_ac_coeff(v, &last, &skip, &value, codingset);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2509 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2510 if(i > 63)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2511 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2512 block[zz_table[i++]] = value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2513 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2514
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2515 /* apply AC prediction if needed */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2516 if(s->ac_pred) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2517 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2518 for(k = 1; k < 8; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2519 block[k << 3] += ac_val[k];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2520 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2521 for(k = 1; k < 8; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2522 block[k] += ac_val[k + 8];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2523 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2524 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2525 /* save AC coeffs for further prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2526 for(k = 1; k < 8; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2527 ac_val2[k] = block[k << 3];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2528 ac_val2[k + 8] = block[k];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2529 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2530
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2531 /* scale AC coeffs */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2532 for(k = 1; k < 64; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2533 if(block[k]) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2534 block[k] *= scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2535 if(!v->pquantizer)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2536 block[k] += (block[k] < 0) ? -v->pq : v->pq;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2537 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2538
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2539 if(s->ac_pred) i = 63;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2540 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2541
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2542 not_coded:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2543 if(!coded) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2544 int k, scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2545 ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2546 ac_val2 = ac_val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2547
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2548 scale = v->pq * 2 + v->halfpq;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2549 memset(ac_val2, 0, 16 * 2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2550 if(dc_pred_dir) {//left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2551 ac_val -= 16;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2552 if(s->ac_pred)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2553 memcpy(ac_val2, ac_val, 8 * 2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2554 } else {//top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2555 ac_val -= 16 * s->block_wrap[n];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2556 if(s->ac_pred)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2557 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2558 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2559
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2560 /* apply AC prediction if needed */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2561 if(s->ac_pred) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2562 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2563 for(k = 1; k < 8; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2564 block[k << 3] = ac_val[k] * scale;
3509
da6095607f26 Don't do non-uniform quantization on zero coeffs.
kostya
parents: 3508
diff changeset
2565 if(!v->pquantizer && block[k << 3])
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2566 block[k << 3] += (block[k << 3] < 0) ? -v->pq : v->pq;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2567 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2568 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2569 for(k = 1; k < 8; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2570 block[k] = ac_val[k + 8] * scale;
3509
da6095607f26 Don't do non-uniform quantization on zero coeffs.
kostya
parents: 3508
diff changeset
2571 if(!v->pquantizer && block[k])
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2572 block[k] += (block[k] < 0) ? -v->pq : v->pq;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2573 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2574 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2575 i = 63;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2576 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2577 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2578 s->block_last_index[n] = i;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2579
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2580 return 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2581 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2582
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2583 /** Decode intra block in intra frames - should be faster than decode_intra_block
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2584 * @param v VC1Context
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2585 * @param block block to decode
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2586 * @param[in] n subblock number
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2587 * @param coded are AC coeffs present or not
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2588 * @param codingset set of VLC to decode data
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2589 * @param mquant quantizer value for this macroblock
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2590 */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2591 static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int coded, int codingset, int mquant)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2592 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2593 GetBitContext *gb = &v->s.gb;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2594 MpegEncContext *s = &v->s;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2595 int dc_pred_dir = 0; /* Direction of the DC prediction used */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2596 int run_diff, i;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2597 int16_t *dc_val;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2598 int16_t *ac_val, *ac_val2;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2599 int dcdiff;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2600 int a_avail = v->a_avail, c_avail = v->c_avail;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2601 int use_pred = s->ac_pred;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2602 int scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2603 int q1, q2 = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2604 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2605
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2606 /* Get DC differential */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2607 if (n < 4) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2608 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2609 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2610 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2611 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2612 if (dcdiff < 0){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2613 av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n");
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2614 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2615 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2616 if (dcdiff)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2617 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2618 if (dcdiff == 119 /* ESC index value */)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2619 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2620 /* TODO: Optimize */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2621 if (mquant == 1) dcdiff = get_bits(gb, 10);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2622 else if (mquant == 2) dcdiff = get_bits(gb, 9);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2623 else dcdiff = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2624 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2625 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2626 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2627 if (mquant == 1)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2628 dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2629 else if (mquant == 2)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2630 dcdiff = (dcdiff<<1) + get_bits1(gb) - 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2631 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2632 if (get_bits1(gb))
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2633 dcdiff = -dcdiff;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2634 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2635
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2636 /* Prediction */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2637 dcdiff += vc1_pred_dc(&v->s, v->overlap, mquant, n, v->a_avail, v->c_avail, &dc_val, &dc_pred_dir);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2638 *dc_val = dcdiff;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2639
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2640 /* Store the quantized DC coeff, used for prediction */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2641 if (n < 4) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2642 block[0] = dcdiff * s->y_dc_scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2643 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2644 block[0] = dcdiff * s->c_dc_scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2645 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2646 /* Skip ? */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2647 run_diff = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2648 i = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2649
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2650 //AC Decoding
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2651 i = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2652
5194
d09eaf79979c this prediction direction adjustment is wrong
kostya
parents: 5128
diff changeset
2653 /* check if AC is needed at all */
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2654 if(!a_avail && !c_avail) use_pred = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2655 ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2656 ac_val2 = ac_val;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2657
5683
dbc41b5a10e7 HALFPQ should be used only for when PQUANT is selected
kostya
parents: 5682
diff changeset
2658 scale = mquant * 2 + ((mquant == v->pq) ? v->halfpq : 0);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2659
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2660 if(dc_pred_dir) //left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2661 ac_val -= 16;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2662 else //top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2663 ac_val -= 16 * s->block_wrap[n];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2664
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2665 q1 = s->current_picture.qscale_table[mb_pos];
4456
33f181383a21 Check for out-of-bounds access
kostya
parents: 4433
diff changeset
2666 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1];
33f181383a21 Check for out-of-bounds access
kostya
parents: 4433
diff changeset
2667 if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
4724
ea97803884e1 1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents: 4683
diff changeset
2668 if(dc_pred_dir && n==1) q2 = q1;
ea97803884e1 1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents: 4683
diff changeset
2669 if(!dc_pred_dir && n==2) q2 = q1;
ea97803884e1 1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents: 4683
diff changeset
2670 if(n==3) q2 = q1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2671
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2672 if(coded) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2673 int last = 0, skip, value;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2674 const int8_t *zz_table;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2675 int k;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2676
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2677 if(v->s.ac_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2678 if(!dc_pred_dir)
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
2679 zz_table = wmv1_scantable[2];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2680 else
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
2681 zz_table = wmv1_scantable[3];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2682 } else
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
2683 zz_table = wmv1_scantable[1];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2684
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2685 while (!last) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2686 vc1_decode_ac_coeff(v, &last, &skip, &value, codingset);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2687 i += skip;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2688 if(i > 63)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2689 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2690 block[zz_table[i++]] = value;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2691 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2692
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2693 /* apply AC prediction if needed */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2694 if(use_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2695 /* scale predictors if needed*/
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2696 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2697 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2698 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2699
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2700 if(dc_pred_dir) { //left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2701 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2702 block[k << 3] += (ac_val[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2703 } else { //top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2704 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2705 block[k] += (ac_val[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2706 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2707 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2708 if(dc_pred_dir) { //left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2709 for(k = 1; k < 8; k++)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2710 block[k << 3] += ac_val[k];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2711 } else { //top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2712 for(k = 1; k < 8; k++)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2713 block[k] += ac_val[k + 8];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2714 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2715 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2716 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2717 /* save AC coeffs for further prediction */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2718 for(k = 1; k < 8; k++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2719 ac_val2[k] = block[k << 3];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2720 ac_val2[k + 8] = block[k];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2721 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2722
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2723 /* scale AC coeffs */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2724 for(k = 1; k < 64; k++)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2725 if(block[k]) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2726 block[k] *= scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2727 if(!v->pquantizer)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2728 block[k] += (block[k] < 0) ? -mquant : mquant;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2729 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2730
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2731 if(use_pred) i = 63;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2732 } else { // no AC coeffs
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2733 int k;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2734
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2735 memset(ac_val2, 0, 16 * 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2736 if(dc_pred_dir) {//left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2737 if(use_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2738 memcpy(ac_val2, ac_val, 8 * 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2739 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2740 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2741 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2742 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2743 ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2744 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2745 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2746 } else {//top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2747 if(use_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2748 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2749 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2750 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2751 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2752 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2753 ac_val2[k + 8] = (ac_val2[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2754 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2755 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2756 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2757
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2758 /* apply AC prediction if needed */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2759 if(use_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2760 if(dc_pred_dir) { //left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2761 for(k = 1; k < 8; k++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2762 block[k << 3] = ac_val2[k] * scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2763 if(!v->pquantizer && block[k << 3])
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2764 block[k << 3] += (block[k << 3] < 0) ? -mquant : mquant;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2765 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2766 } else { //top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2767 for(k = 1; k < 8; k++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2768 block[k] = ac_val2[k + 8] * scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2769 if(!v->pquantizer && block[k])
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2770 block[k] += (block[k] < 0) ? -mquant : mquant;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2771 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2772 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2773 i = 63;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2774 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2775 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2776 s->block_last_index[n] = i;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2777
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2778 return 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2779 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2780
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2781 /** Decode intra block in inter frames - more generic version than vc1_decode_i_block
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2782 * @param v VC1Context
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2783 * @param block block to decode
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
2784 * @param[in] n subblock index
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2785 * @param coded are AC coeffs present or not
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2786 * @param mquant block quantizer
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2787 * @param codingset set of VLC to decode data
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2788 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2789 static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int coded, int mquant, int codingset)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2790 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2791 GetBitContext *gb = &v->s.gb;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2792 MpegEncContext *s = &v->s;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2793 int dc_pred_dir = 0; /* Direction of the DC prediction used */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2794 int run_diff, i;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2795 int16_t *dc_val;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2796 int16_t *ac_val, *ac_val2;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2797 int dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2798 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
2799 int a_avail = v->a_avail, c_avail = v->c_avail;
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2800 int use_pred = s->ac_pred;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2801 int scale;
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2802 int q1, q2 = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2803
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2804 /* XXX: Guard against dumb values of mquant */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2805 mquant = (mquant < 1) ? 0 : ( (mquant>31) ? 31 : mquant );
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2806
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2807 /* Set DC scale - y and c use the same */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2808 s->y_dc_scale = s->y_dc_scale_table[mquant];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2809 s->c_dc_scale = s->c_dc_scale_table[mquant];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2810
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2811 /* Get DC differential */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2812 if (n < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2813 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2814 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2815 dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2816 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2817 if (dcdiff < 0){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2818 av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2819 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2820 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2821 if (dcdiff)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2822 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2823 if (dcdiff == 119 /* ESC index value */)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2824 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2825 /* TODO: Optimize */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2826 if (mquant == 1) dcdiff = get_bits(gb, 10);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2827 else if (mquant == 2) dcdiff = get_bits(gb, 9);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2828 else dcdiff = get_bits(gb, 8);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2829 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2830 else
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2831 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2832 if (mquant == 1)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2833 dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2834 else if (mquant == 2)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2835 dcdiff = (dcdiff<<1) + get_bits1(gb) - 1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2836 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2837 if (get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2838 dcdiff = -dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2839 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2840
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2841 /* Prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2842 dcdiff += vc1_pred_dc(&v->s, v->overlap, mquant, n, a_avail, c_avail, &dc_val, &dc_pred_dir);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2843 *dc_val = dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2844
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2845 /* Store the quantized DC coeff, used for prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2846
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2847 if (n < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2848 block[0] = dcdiff * s->y_dc_scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2849 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2850 block[0] = dcdiff * s->c_dc_scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2851 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2852 /* Skip ? */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2853 run_diff = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2854 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2855
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2856 //AC Decoding
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2857 i = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2858
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2859 /* check if AC is needed at all and adjust direction if needed */
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2860 if(!a_avail) dc_pred_dir = 1;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2861 if(!c_avail) dc_pred_dir = 0;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2862 if(!a_avail && !c_avail) use_pred = 0;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2863 ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2864 ac_val2 = ac_val;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2865
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2866 scale = mquant * 2 + v->halfpq;
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2867
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2868 if(dc_pred_dir) //left
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2869 ac_val -= 16;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2870 else //top
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2871 ac_val -= 16 * s->block_wrap[n];
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2872
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2873 q1 = s->current_picture.qscale_table[mb_pos];
4303
7e907f7d6a21 Check mb_pos is big enough before trying to access data left or above.
reimar
parents: 4283
diff changeset
2874 if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1];
7e907f7d6a21 Check mb_pos is big enough before trying to access data left or above.
reimar
parents: 4283
diff changeset
2875 if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
4724
ea97803884e1 1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents: 4683
diff changeset
2876 if(dc_pred_dir && n==1) q2 = q1;
ea97803884e1 1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents: 4683
diff changeset
2877 if(!dc_pred_dir && n==2) q2 = q1;
ea97803884e1 1000l to myself - get correct quantization for blocks 1 and 2
kostya
parents: 4683
diff changeset
2878 if(n==3) q2 = q1;
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2879
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2880 if(coded) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2881 int last = 0, skip, value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2882 const int8_t *zz_table;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2883 int k;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2884
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
2885 zz_table = wmv1_scantable[0];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2886
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2887 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2888 vc1_decode_ac_coeff(v, &last, &skip, &value, codingset);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2889 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2890 if(i > 63)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2891 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2892 block[zz_table[i++]] = value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2893 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2894
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2895 /* apply AC prediction if needed */
3378
d7dda9fd99c8 Adjust AC prediction if (some) predictors are not available.
kostya
parents: 3377
diff changeset
2896 if(use_pred) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2897 /* scale predictors if needed*/
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2898 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2899 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2900 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2901
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2902 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2903 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2904 block[k << 3] += (ac_val[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2905 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2906 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2907 block[k] += (ac_val[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2908 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2909 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2910 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2911 for(k = 1; k < 8; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2912 block[k << 3] += ac_val[k];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2913 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2914 for(k = 1; k < 8; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2915 block[k] += ac_val[k + 8];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2916 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2917 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2918 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2919 /* save AC coeffs for further prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2920 for(k = 1; k < 8; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2921 ac_val2[k] = block[k << 3];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2922 ac_val2[k + 8] = block[k];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2923 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2924
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2925 /* scale AC coeffs */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2926 for(k = 1; k < 64; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2927 if(block[k]) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2928 block[k] *= scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2929 if(!v->pquantizer)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2930 block[k] += (block[k] < 0) ? -mquant : mquant;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2931 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2932
3378
d7dda9fd99c8 Adjust AC prediction if (some) predictors are not available.
kostya
parents: 3377
diff changeset
2933 if(use_pred) i = 63;
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2934 } else { // no AC coeffs
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2935 int k;
3378
d7dda9fd99c8 Adjust AC prediction if (some) predictors are not available.
kostya
parents: 3377
diff changeset
2936
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2937 memset(ac_val2, 0, 16 * 2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2938 if(dc_pred_dir) {//left
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2939 if(use_pred) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2940 memcpy(ac_val2, ac_val, 8 * 2);
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2941 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2942 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2943 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2944 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2945 ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2946 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2947 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2948 } else {//top
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2949 if(use_pred) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2950 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2);
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2951 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2952 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2953 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2954 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2955 ac_val2[k + 8] = (ac_val2[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2956 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2957 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2958 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2959
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2960 /* apply AC prediction if needed */
3378
d7dda9fd99c8 Adjust AC prediction if (some) predictors are not available.
kostya
parents: 3377
diff changeset
2961 if(use_pred) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2962 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2963 for(k = 1; k < 8; k++) {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2964 block[k << 3] = ac_val2[k] * scale;
3509
da6095607f26 Don't do non-uniform quantization on zero coeffs.
kostya
parents: 3508
diff changeset
2965 if(!v->pquantizer && block[k << 3])
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2966 block[k << 3] += (block[k << 3] < 0) ? -mquant : mquant;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2967 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2968 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2969 for(k = 1; k < 8; k++) {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2970 block[k] = ac_val2[k + 8] * scale;
3509
da6095607f26 Don't do non-uniform quantization on zero coeffs.
kostya
parents: 3508
diff changeset
2971 if(!v->pquantizer && block[k])
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2972 block[k] += (block[k] < 0) ? -mquant : mquant;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2973 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2974 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2975 i = 63;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2976 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2977 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2978 s->block_last_index[n] = i;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2979
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2980 return 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2981 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2982
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2983 /** Decode P block
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2984 */
5997
90de28dfd8d6 Switch VC-1 decoder to output decoded residual immediately.
kostya
parents: 5964
diff changeset
2985 static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquant, int ttmb, int first_block,
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
2986 uint8_t *dst, int linesize, int skip_block, int apply_filter, int cbp_top, int cbp_left)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2987 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2988 MpegEncContext *s = &v->s;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2989 GetBitContext *gb = &s->gb;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2990 int i, j;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2991 int subblkpat = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2992 int scale, off, idx, last, skip, value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2993 int ttblk = ttmb & 7;
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
2994 int pat = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2995
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2996 if(ttmb == -1) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2997 ttblk = ff_vc1_ttblk_to_tt[v->tt_index][get_vlc2(gb, ff_vc1_ttblk_vlc[v->tt_index].table, VC1_TTBLK_VLC_BITS, 1)];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2998 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2999 if(ttblk == TT_4X4) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3000 subblkpat = ~(get_vlc2(gb, ff_vc1_subblkpat_vlc[v->tt_index].table, VC1_SUBBLKPAT_VLC_BITS, 1) + 1);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3001 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3002 if((ttblk != TT_8X8 && ttblk != TT_4X4) && (v->ttmbf || (ttmb != -1 && (ttmb & 8) && !first_block))) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3003 subblkpat = decode012(gb);
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
3004 if(subblkpat) subblkpat ^= 3; //swap decoded pattern bits
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3005 if(ttblk == TT_8X4_TOP || ttblk == TT_8X4_BOTTOM) ttblk = TT_8X4;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3006 if(ttblk == TT_4X8_RIGHT || ttblk == TT_4X8_LEFT) ttblk = TT_4X8;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3007 }
4948
74caff45a271 Use correct dequantizer value
kostya
parents: 4929
diff changeset
3008 scale = 2 * mquant + ((v->pq == mquant) ? v->halfpq : 0);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3009
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3010 // convert transforms like 8X4_TOP to generic TT and SUBBLKPAT
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3011 if(ttblk == TT_8X4_TOP || ttblk == TT_8X4_BOTTOM) {
3377
dc4813852345 0xFFFF l of cola. Now P-frames are decoded almost without distortions.
kostya
parents: 3376
diff changeset
3012 subblkpat = 2 - (ttblk == TT_8X4_TOP);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3013 ttblk = TT_8X4;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3014 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3015 if(ttblk == TT_4X8_RIGHT || ttblk == TT_4X8_LEFT) {
3377
dc4813852345 0xFFFF l of cola. Now P-frames are decoded almost without distortions.
kostya
parents: 3376
diff changeset
3016 subblkpat = 2 - (ttblk == TT_4X8_LEFT);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3017 ttblk = TT_4X8;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3018 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3019 switch(ttblk) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3020 case TT_8X8:
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3021 pat = 0xF;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3022 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3023 last = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3024 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3025 vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3026 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3027 if(i > 63)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3028 break;
7136
7a73d76aaaa0 remove duplicate tables
stefang
parents: 7040
diff changeset
3029 idx = wmv1_scantable[0][i++];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3030 block[idx] = value * scale;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
3031 if(!v->pquantizer)
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
3032 block[idx] += (block[idx] < 0) ? -mquant : mquant;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3033 }
5997
90de28dfd8d6 Switch VC-1 decoder to output decoded residual immediately.
kostya
parents: 5964
diff changeset
3034 if(!skip_block){
90de28dfd8d6 Switch VC-1 decoder to output decoded residual immediately.
kostya
parents: 5964
diff changeset
3035 s->dsp.vc1_inv_trans_8x8(block);
90de28dfd8d6 Switch VC-1 decoder to output decoded residual immediately.
kostya
parents: 5964
diff changeset
3036 s->dsp.add_pixels_clamped(block, dst, linesize);
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3037 if(apply_filter && cbp_top & 0xC)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3038 vc1_loop_filter(dst, 1, linesize, 8, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3039 if(apply_filter && cbp_left & 0xA)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3040 vc1_loop_filter(dst, linesize, 1, 8, mquant);
5997
90de28dfd8d6 Switch VC-1 decoder to output decoded residual immediately.
kostya
parents: 5964
diff changeset
3041 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3042 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3043 case TT_4X4:
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3044 pat = ~subblkpat & 0xF;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3045 for(j = 0; j < 4; j++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3046 last = subblkpat & (1 << (3 - j));
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3047 i = 0;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3048 off = (j & 1) * 4 + (j & 2) * 16;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3049 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3050 vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3051 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3052 if(i > 15)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3053 break;
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3054 idx = ff_vc1_simple_progressive_4x4_zz[i++];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3055 block[idx + off] = value * scale;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
3056 if(!v->pquantizer)
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
3057 block[idx + off] += (block[idx + off] < 0) ? -mquant : mquant;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3058 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3059 if(!(subblkpat & (1 << (3 - j))) && !skip_block){
5997
90de28dfd8d6 Switch VC-1 decoder to output decoded residual immediately.
kostya
parents: 5964
diff changeset
3060 s->dsp.vc1_inv_trans_4x4(dst + (j&1)*4 + (j&2)*2*linesize, linesize, block + off);
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3061 if(apply_filter && (j&2 ? pat & (1<<(j-2)) : (cbp_top & (1 << (j + 2)))))
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3062 vc1_loop_filter(dst + (j&1)*4 + (j&2)*2*linesize, 1, linesize, 4, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3063 if(apply_filter && (j&1 ? pat & (1<<(j-1)) : (cbp_left & (1 << (j + 1)))))
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3064 vc1_loop_filter(dst + (j&1)*4 + (j&2)*2*linesize, linesize, 1, 4, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3065 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3066 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3067 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3068 case TT_8X4:
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3069 pat = ~((subblkpat & 2)*6 + (subblkpat & 1)*3) & 0xF;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3070 for(j = 0; j < 2; j++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3071 last = subblkpat & (1 << (1 - j));
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3072 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3073 off = j * 32;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3074 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3075 vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3076 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3077 if(i > 31)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3078 break;
6145
ddf5d7fae101 Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents: 6099
diff changeset
3079 idx = v->zz_8x4[i++]+off;
ddf5d7fae101 Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents: 6099
diff changeset
3080 block[idx] = value * scale;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
3081 if(!v->pquantizer)
6145
ddf5d7fae101 Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents: 6099
diff changeset
3082 block[idx] += (block[idx] < 0) ? -mquant : mquant;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3083 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3084 if(!(subblkpat & (1 << (1 - j))) && !skip_block){
5997
90de28dfd8d6 Switch VC-1 decoder to output decoded residual immediately.
kostya
parents: 5964
diff changeset
3085 s->dsp.vc1_inv_trans_8x4(dst + j*4*linesize, linesize, block + off);
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3086 if(apply_filter && j ? pat & 0x3 : (cbp_top & 0xC))
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3087 vc1_loop_filter(dst + j*4*linesize, 1, linesize, 8, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3088 if(apply_filter && cbp_left & (2 << j))
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3089 vc1_loop_filter(dst + j*4*linesize, linesize, 1, 4, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3090 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3091 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3092 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3093 case TT_4X8:
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3094 pat = ~(subblkpat*5) & 0xF;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3095 for(j = 0; j < 2; j++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3096 last = subblkpat & (1 << (1 - j));
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3097 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3098 off = j * 4;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3099 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3100 vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3101 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3102 if(i > 31)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3103 break;
6145
ddf5d7fae101 Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents: 6099
diff changeset
3104 idx = v->zz_4x8[i++]+off;
ddf5d7fae101 Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents: 6099
diff changeset
3105 block[idx] = value * scale;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
3106 if(!v->pquantizer)
6145
ddf5d7fae101 Select scan tables for 8x4 and 4x8 blocks only once.
kostya
parents: 6099
diff changeset
3107 block[idx] += (block[idx] < 0) ? -mquant : mquant;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3108 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3109 if(!(subblkpat & (1 << (1 - j))) && !skip_block){
5997
90de28dfd8d6 Switch VC-1 decoder to output decoded residual immediately.
kostya
parents: 5964
diff changeset
3110 s->dsp.vc1_inv_trans_4x8(dst + j*4, linesize, block + off);
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3111 if(apply_filter && cbp_top & (2 << j))
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3112 vc1_loop_filter(dst + j*4, 1, linesize, 4, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3113 if(apply_filter && j ? pat & 0x5 : (cbp_left & 0xA))
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3114 vc1_loop_filter(dst + j*4, linesize, 1, 8, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3115 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3116 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3117 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3118 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3119 return pat;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3120 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3121
8685
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
3122 /** @} */ // Macroblock group
ed386fa1399e Fix Doxygen comments for VC-1 decoder.
kostya
parents: 8645
diff changeset
3123
8645
ead59531f24a avoid duplication of size_table and offset_table
stefang
parents: 8640
diff changeset
3124 static const int size_table [6] = { 0, 2, 3, 4, 5, 8 };
ead59531f24a avoid duplication of size_table and offset_table
stefang
parents: 8640
diff changeset
3125 static const int offset_table[6] = { 0, 1, 3, 7, 15, 31 };
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3126
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3127 /** Decode one P-frame MB (in Simple/Main profile)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3128 */
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3129 static int vc1_decode_p_mb(VC1Context *v)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3130 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3131 MpegEncContext *s = &v->s;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3132 GetBitContext *gb = &s->gb;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3133 int i, j;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3134 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3135 int cbp; /* cbp decoding stuff */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3136 int mqdiff, mquant; /* MB quantization */
3405
58c4fd135462 Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents: 3404
diff changeset
3137 int ttmb = v->ttfrm; /* MB Transform type */
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3138
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3139 int mb_has_coeffs = 1; /* last_flag */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3140 int dmv_x, dmv_y; /* Differential MV components */
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6712
diff changeset
3141 int index, index1; /* LUT indexes */
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3142 int val, sign; /* temp values */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3143 int first_block = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3144 int dst_idx, off;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3145 int skipped, fourmv;
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3146 int block_cbp = 0, pat;
7846
a7162bb60138 Make it possible to disable loop filter in VC-1.
kostya
parents: 7429
diff changeset
3147 int apply_loop_filter;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3148
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3149 mquant = v->pq; /* Loosy initialization */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3150
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3151 if (v->mv_type_is_raw)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3152 fourmv = get_bits1(gb);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3153 else
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3154 fourmv = v->mv_type_mb_plane[mb_pos];
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3155 if (v->skip_is_raw)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3156 skipped = get_bits1(gb);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3157 else
3375
a1c2e1603be9 Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents: 3371
diff changeset
3158 skipped = v->s.mbskip_table[mb_pos];
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3159
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3160 s->dsp.clear_blocks(s->block[0]);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3161
7846
a7162bb60138 Make it possible to disable loop filter in VC-1.
kostya
parents: 7429
diff changeset
3162 apply_loop_filter = s->loop_filter && !(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3163 if (!fourmv) /* 1MV mode */
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3164 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3165 if (!skipped)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3166 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3167 GET_MVDATA(dmv_x, dmv_y);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3168
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3169 if (s->mb_intra) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3170 s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3171 s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3172 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3173 s->current_picture.mb_type[mb_pos] = s->mb_intra ? MB_TYPE_INTRA : MB_TYPE_16x16;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3174 vc1_pred_mv(s, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0]);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3175
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3176 /* FIXME Set DC val for inter block ? */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3177 if (s->mb_intra && !mb_has_coeffs)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3178 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3179 GET_MQUANT();
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3180 s->ac_pred = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3181 cbp = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3182 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3183 else if (mb_has_coeffs)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3184 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3185 if (s->mb_intra) s->ac_pred = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3186 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3187 GET_MQUANT();
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3188 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3189 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3190 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3191 mquant = v->pq;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3192 cbp = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3193 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3194 s->current_picture.qscale_table[mb_pos] = mquant;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3195
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3196 if (!v->ttmbf && !s->mb_intra && mb_has_coeffs)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3197 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table,
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3198 VC1_TTMB_VLC_BITS, 2);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3199 if(!s->mb_intra) vc1_mc_1mv(v, 0);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3200 dst_idx = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3201 for (i=0; i<6; i++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3202 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3203 s->dc_val[0][s->block_index[i]] = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3204 dst_idx += i >> 2;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3205 val = ((cbp >> (5 - i)) & 1);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3206 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3207 v->mb_type[0][s->block_index[i]] = s->mb_intra;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3208 if(s->mb_intra) {
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
3209 /* check if prediction blocks A and C are available */
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
3210 v->a_avail = v->c_avail = 0;
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
3211 if(i == 2 || i == 3 || !s->first_slice_line)
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3212 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3213 if(i == 1 || i == 3 || s->mb_x)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3214 v->c_avail = v->mb_type[0][s->block_index[i] - 1];
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
3215
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3216 vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset);
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3217 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
3218 s->dsp.vc1_inv_trans_8x8(s->block[i]);
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
3219 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
5921
afcd3b752f95 Use put_signed_pixels_clamped where appropriate
kostya
parents: 5905
diff changeset
3220 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3221 if(v->pq >= 9 && v->overlap) {
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3222 if(v->c_avail)
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3223 s->dsp.vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3224 if(v->a_avail)
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3225 s->dsp.vc1_v_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3226 }
7846
a7162bb60138 Make it possible to disable loop filter in VC-1.
kostya
parents: 7429
diff changeset
3227 if(apply_loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3228 int left_cbp, top_cbp;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3229 if(i & 4){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3230 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3231 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3232 }else{
8582
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3233 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4));
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3234 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4));
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3235 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3236 if(left_cbp & 0xC)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3237 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3238 if(top_cbp & 0xA)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3239 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3240 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3241 block_cbp |= 0xF << (i << 2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3242 } else if(val) {
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3243 int left_cbp = 0, top_cbp = 0, filter = 0;
7846
a7162bb60138 Make it possible to disable loop filter in VC-1.
kostya
parents: 7429
diff changeset
3244 if(apply_loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3245 filter = 1;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3246 if(i & 4){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3247 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3248 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3249 }else{
8582
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3250 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4));
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3251 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4));
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3252 }
8582
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3253 if(left_cbp & 0xC)
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3254 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant);
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3255 if(top_cbp & 0xA)
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3256 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant);
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3257 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3258 pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), filter, left_cbp, top_cbp);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3259 block_cbp |= pat << (i << 2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3260 if(!v->ttmbf && ttmb < 8) ttmb = -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3261 first_block = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3262 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3263 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3264 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3265 else //Skipped
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3266 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3267 s->mb_intra = 0;
3507
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3268 for(i = 0; i < 6; i++) {
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3269 v->mb_type[0][s->block_index[i]] = 0;
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3270 s->dc_val[0][s->block_index[i]] = 0;
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3271 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3272 s->current_picture.mb_type[mb_pos] = MB_TYPE_SKIP;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3273 s->current_picture.qscale_table[mb_pos] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3274 vc1_pred_mv(s, 0, 0, 0, 1, v->range_x, v->range_y, v->mb_type[0]);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3275 vc1_mc_1mv(v, 0);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3276 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3277 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3278 } //1MV mode
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3279 else //4MV mode
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3280 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3281 if (!skipped /* unskipped MB */)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3282 {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3283 int intra_count = 0, coded_inter = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3284 int is_intra[6], is_coded[6];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3285 /* Get CBPCY */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3286 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3287 for (i=0; i<6; i++)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3288 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3289 val = ((cbp >> (5 - i)) & 1);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3290 s->dc_val[0][s->block_index[i]] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3291 s->mb_intra = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3292 if(i < 4) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3293 dmv_x = dmv_y = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3294 s->mb_intra = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3295 mb_has_coeffs = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3296 if(val) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3297 GET_MVDATA(dmv_x, dmv_y);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3298 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3299 vc1_pred_mv(s, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0]);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3300 if(!s->mb_intra) vc1_mc_4mv_luma(v, i);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3301 intra_count += s->mb_intra;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3302 is_intra[i] = s->mb_intra;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3303 is_coded[i] = mb_has_coeffs;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3304 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3305 if(i&4){
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3306 is_intra[i] = (intra_count >= 3);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3307 is_coded[i] = val;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3308 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3309 if(i == 4) vc1_mc_4mv_chroma(v);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3310 v->mb_type[0][s->block_index[i]] = is_intra[i];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3311 if(!coded_inter) coded_inter = !is_intra[i] & is_coded[i];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3312 }
3453
e3f5377bddb2 Check if 4-MV MB should not be decoded.
kostya
parents: 3452
diff changeset
3313 // if there are no coded blocks then don't do anything more
3514
db3335b2b8f1 Some fixes for decode_p_mb()
kostya
parents: 3513
diff changeset
3314 if(!intra_count && !coded_inter) return 0;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3315 dst_idx = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3316 GET_MQUANT();
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3317 s->current_picture.qscale_table[mb_pos] = mquant;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3318 /* test if block is intra and has pred */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3319 {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3320 int intrapred = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3321 for(i=0; i<6; i++)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3322 if(is_intra[i]) {
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
3323 if(((!s->first_slice_line || (i==2 || i==3)) && v->mb_type[0][s->block_index[i] - s->block_wrap[i]])
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
3324 || ((s->mb_x || (i==1 || i==3)) && v->mb_type[0][s->block_index[i] - 1])) {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3325 intrapred = 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3326 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3327 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3328 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3329 if(intrapred)s->ac_pred = get_bits1(gb);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3330 else s->ac_pred = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3331 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3332 if (!v->ttmbf && coded_inter)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3333 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3334 for (i=0; i<6; i++)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3335 {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3336 dst_idx += i >> 2;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3337 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3338 s->mb_intra = is_intra[i];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3339 if (is_intra[i]) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3340 /* check if prediction blocks A and C are available */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3341 v->a_avail = v->c_avail = 0;
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
3342 if(i == 2 || i == 3 || !s->first_slice_line)
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3343 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3344 if(i == 1 || i == 3 || s->mb_x)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3345 v->c_avail = v->mb_type[0][s->block_index[i] - 1];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3346
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3347 vc1_decode_intra_block(v, s->block[i], i, is_coded[i], mquant, (i&4)?v->codingset2:v->codingset);
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3348 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
3349 s->dsp.vc1_inv_trans_8x8(s->block[i]);
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
3350 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
5921
afcd3b752f95 Use put_signed_pixels_clamped where appropriate
kostya
parents: 5905
diff changeset
3351 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3352 if(v->pq >= 9 && v->overlap) {
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3353 if(v->c_avail)
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3354 s->dsp.vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3355 if(v->a_avail)
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3356 s->dsp.vc1_v_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3357 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3358 if(v->s.loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3359 int left_cbp, top_cbp;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3360 if(i & 4){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3361 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3362 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3363 }else{
8582
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3364 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4));
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3365 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4));
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3366 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3367 if(left_cbp & 0xC)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3368 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3369 if(top_cbp & 0xA)
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3370 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3371 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3372 block_cbp |= 0xF << (i << 2);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3373 } else if(is_coded[i]) {
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3374 int left_cbp = 0, top_cbp = 0, filter = 0;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3375 if(v->s.loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3376 filter = 1;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3377 if(i & 4){
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3378 left_cbp = v->cbp[s->mb_x - 1] >> (i * 4);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3379 top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3380 }else{
8582
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3381 left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4));
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3382 top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4));
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3383 }
8582
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3384 if(left_cbp & 0xC)
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3385 vc1_loop_filter(s->dest[dst_idx] + off, 1, i & 4 ? s->uvlinesize : s->linesize, 8, mquant);
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3386 if(top_cbp & 0xA)
2624a270ef12 421l: fix loop filter for P-frames in VC-1
kostya
parents: 8560
diff changeset
3387 vc1_loop_filter(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, 1, 8, mquant);
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3388 }
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3389 pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), filter, left_cbp, top_cbp);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3390 block_cbp |= pat << (i << 2);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3391 if(!v->ttmbf && ttmb < 8) ttmb = -1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3392 first_block = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3393 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3394 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3395 return 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3396 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3397 else //Skipped MB
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3398 {
3400
84de54d536bd 4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents: 3399
diff changeset
3399 s->mb_intra = 0;
3514
db3335b2b8f1 Some fixes for decode_p_mb()
kostya
parents: 3513
diff changeset
3400 s->current_picture.qscale_table[mb_pos] = 0;
3507
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3401 for (i=0; i<6; i++) {
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3402 v->mb_type[0][s->block_index[i]] = 0;
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3403 s->dc_val[0][s->block_index[i]] = 0;
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3404 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3405 for (i=0; i<4; i++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3406 {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3407 vc1_pred_mv(s, i, 0, 0, 0, v->range_x, v->range_y, v->mb_type[0]);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3408 vc1_mc_4mv_luma(v, i);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3409 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3410 vc1_mc_4mv_chroma(v);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3411 s->current_picture.qscale_table[mb_pos] = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3412 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3413 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3414 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3415 v->cbp[s->mb_x] = block_cbp;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3416
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3417 /* Should never happen */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3418 return -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3419 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3420
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3421 /** Decode one B-frame MB (in Main profile)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3422 */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3423 static void vc1_decode_b_mb(VC1Context *v)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3424 {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3425 MpegEncContext *s = &v->s;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3426 GetBitContext *gb = &s->gb;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3427 int i, j;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3428 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3429 int cbp = 0; /* cbp decoding stuff */
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3430 int mqdiff, mquant; /* MB quantization */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3431 int ttmb = v->ttfrm; /* MB Transform type */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3432 int mb_has_coeffs = 0; /* last_flag */
6903
0f63fc62ea8b consistency cosmetics: indices --> indexes
diego
parents: 6712
diff changeset
3433 int index, index1; /* LUT indexes */
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3434 int val, sign; /* temp values */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3435 int first_block = 1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3436 int dst_idx, off;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3437 int skipped, direct;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3438 int dmv_x[2], dmv_y[2];
3690
35aae593db08 [Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents: 3689
diff changeset
3439 int bmvtype = BMV_TYPE_BACKWARD;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3440
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3441 mquant = v->pq; /* Loosy initialization */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3442 s->mb_intra = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3443
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3444 if (v->dmb_is_raw)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3445 direct = get_bits1(gb);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3446 else
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3447 direct = v->direct_mb_plane[mb_pos];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3448 if (v->skip_is_raw)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3449 skipped = get_bits1(gb);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3450 else
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3451 skipped = v->s.mbskip_table[mb_pos];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3452
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3453 s->dsp.clear_blocks(s->block[0]);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3454 dmv_x[0] = dmv_x[1] = dmv_y[0] = dmv_y[1] = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3455 for(i = 0; i < 6; i++) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3456 v->mb_type[0][s->block_index[i]] = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3457 s->dc_val[0][s->block_index[i]] = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3458 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3459 s->current_picture.qscale_table[mb_pos] = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3460
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3461 if (!direct) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3462 if (!skipped) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3463 GET_MVDATA(dmv_x[0], dmv_y[0]);
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3464 dmv_x[1] = dmv_x[0];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3465 dmv_y[1] = dmv_y[0];
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3466 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3467 if(skipped || !s->mb_intra) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3468 bmvtype = decode012(gb);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3469 switch(bmvtype) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3470 case 0:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3471 bmvtype = (v->bfraction >= (B_FRACTION_DEN/2)) ? BMV_TYPE_BACKWARD : BMV_TYPE_FORWARD;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3472 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3473 case 1:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3474 bmvtype = (v->bfraction >= (B_FRACTION_DEN/2)) ? BMV_TYPE_FORWARD : BMV_TYPE_BACKWARD;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3475 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3476 case 2:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3477 bmvtype = BMV_TYPE_INTERPOLATED;
3743
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
3478 dmv_x[0] = dmv_y[0] = 0;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3479 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3480 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3481 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3482 for(i = 0; i < 6; i++)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3483 v->mb_type[0][s->block_index[i]] = s->mb_intra;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3484
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3485 if (skipped) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3486 if(direct) bmvtype = BMV_TYPE_INTERPOLATED;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3487 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3488 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3489 return;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3490 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3491 if (direct) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3492 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3493 GET_MQUANT();
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3494 s->mb_intra = 0;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3495 mb_has_coeffs = 0;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3496 s->current_picture.qscale_table[mb_pos] = mquant;
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3497 if(!v->ttmbf)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3498 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3499 dmv_x[0] = dmv_y[0] = dmv_x[1] = dmv_y[1] = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3500 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3501 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3502 } else {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3503 if(!mb_has_coeffs && !s->mb_intra) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3504 /* no coded blocks - effectively skipped */
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3505 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3506 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3507 return;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3508 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3509 if(s->mb_intra && !mb_has_coeffs) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3510 GET_MQUANT();
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3511 s->current_picture.qscale_table[mb_pos] = mquant;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3512 s->ac_pred = get_bits1(gb);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3513 cbp = 0;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3514 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3515 } else {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3516 if(bmvtype == BMV_TYPE_INTERPOLATED) {
3743
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
3517 GET_MVDATA(dmv_x[0], dmv_y[0]);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3518 if(!mb_has_coeffs) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3519 /* interpolated skipped block */
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3520 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3521 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3522 return;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3523 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3524 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3525 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3526 if(!s->mb_intra) {
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3527 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3528 }
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3529 if(s->mb_intra)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3530 s->ac_pred = get_bits1(gb);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3531 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3532 GET_MQUANT();
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3533 s->current_picture.qscale_table[mb_pos] = mquant;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3534 if(!v->ttmbf && !s->mb_intra && mb_has_coeffs)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3535 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3536 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3537 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3538 dst_idx = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3539 for (i=0; i<6; i++)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3540 {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3541 s->dc_val[0][s->block_index[i]] = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3542 dst_idx += i >> 2;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3543 val = ((cbp >> (5 - i)) & 1);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3544 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3545 v->mb_type[0][s->block_index[i]] = s->mb_intra;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3546 if(s->mb_intra) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3547 /* check if prediction blocks A and C are available */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3548 v->a_avail = v->c_avail = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3549 if(i == 2 || i == 3 || !s->first_slice_line)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3550 v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3551 if(i == 1 || i == 3 || s->mb_x)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3552 v->c_avail = v->mb_type[0][s->block_index[i] - 1];
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3553
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3554 vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset);
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3555 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
3556 s->dsp.vc1_inv_trans_8x8(s->block[i]);
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
3557 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
5921
afcd3b752f95 Use put_signed_pixels_clamped where appropriate
kostya
parents: 5905
diff changeset
3558 s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3559 } else if(val) {
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3560 vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), 0, 0, 0);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3561 if(!v->ttmbf && ttmb < 8) ttmb = -1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3562 first_block = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3563 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3564 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3565 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3566
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3567 /** Decode blocks of I-frame
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3568 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3569 static void vc1_decode_i_blocks(VC1Context *v)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3570 {
3450
906c58dcb6ea Use overlap filter instead of loop filter.
kostya
parents: 3449
diff changeset
3571 int k, j;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3572 MpegEncContext *s = &v->s;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3573 int cbp, val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3574 uint8_t *coded_val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3575 int mb_pos;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3576
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3577 /* select codingmode used for VLC tables selection */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3578 switch(v->y_ac_table_index){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3579 case 0:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3580 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3581 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3582 case 1:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3583 v->codingset = CS_HIGH_MOT_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3584 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3585 case 2:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3586 v->codingset = CS_MID_RATE_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3587 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3588 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3589
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3590 switch(v->c_ac_table_index){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3591 case 0:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3592 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3593 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3594 case 1:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3595 v->codingset2 = CS_HIGH_MOT_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3596 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3597 case 2:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3598 v->codingset2 = CS_MID_RATE_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3599 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3600 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3601
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3602 /* Set DC scale - y and c use the same */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3603 s->y_dc_scale = s->y_dc_scale_table[v->pq];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3604 s->c_dc_scale = s->c_dc_scale_table[v->pq];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3605
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3606 //do frame decode
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3607 s->mb_x = s->mb_y = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3608 s->mb_intra = 1;
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
3609 s->first_slice_line = 1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3610 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3611 for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3612 ff_init_block_index(s);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3613 ff_update_block_index(s);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3614 s->dsp.clear_blocks(s->block[0]);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3615 mb_pos = s->mb_x + s->mb_y * s->mb_width;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3616 s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3617 s->current_picture.qscale_table[mb_pos] = v->pq;
3710
08280665be40 Set motion vectors used in B-frames to zero by default
kostya
parents: 3709
diff changeset
3618 s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
08280665be40 Set motion vectors used in B-frames to zero by default
kostya
parents: 3709
diff changeset
3619 s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3620
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3621 // do actual MB decoding and displaying
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3622 cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3623 v->s.ac_pred = get_bits1(&v->s.gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3624
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3625 for(k = 0; k < 6; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3626 val = ((cbp >> (5 - k)) & 1);
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
3627
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3628 if (k < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3629 int pred = vc1_coded_block_pred(&v->s, k, &coded_val);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3630 val = val ^ pred;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3631 *coded_val = val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3632 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3633 cbp |= val << (5 - k);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3634
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3635 vc1_decode_i_block(v, s->block[k], k, val, (k<4)? v->codingset : v->codingset2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3636
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
3637 s->dsp.vc1_inv_trans_8x8(s->block[k]);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3638 if(v->pq >= 9 && v->overlap) {
3450
906c58dcb6ea Use overlap filter instead of loop filter.
kostya
parents: 3449
diff changeset
3639 for(j = 0; j < 64; j++) s->block[k][j] += 128;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3640 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3641 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3642
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3643 vc1_put_block(v, s->block);
3690
35aae593db08 [Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents: 3689
diff changeset
3644 if(v->pq >= 9 && v->overlap) {
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3645 if(s->mb_x) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3646 s->dsp.vc1_h_overlap(s->dest[0], s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3647 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize);
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3648 if(!(s->flags & CODEC_FLAG_GRAY)) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3649 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3650 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize);
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3651 }
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3652 }
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3653 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3654 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize);
3450
906c58dcb6ea Use overlap filter instead of loop filter.
kostya
parents: 3449
diff changeset
3655 if(!s->first_slice_line) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3656 s->dsp.vc1_v_overlap(s->dest[0], s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3657 s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize);
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3658 if(!(s->flags & CODEC_FLAG_GRAY)) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3659 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3660 s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize);
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3661 }
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
3662 }
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3663 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3664 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize);
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
3665 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3666 if(v->s.loop_filter) vc1_loop_filter_iblk(s, s->current_picture.qscale_table[mb_pos]);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3667
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3668 if(get_bits_count(&s->gb) > v->bits) {
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
3669 ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END));
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3670 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n", get_bits_count(&s->gb), v->bits);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3671 return;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3672 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3673 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3674 ff_draw_horiz_band(s, s->mb_y * 16, 16);
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
3675 s->first_slice_line = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3676 }
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
3677 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3678 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3679
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3680 /** Decode blocks of I-frame for advanced profile
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3681 */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3682 static void vc1_decode_i_blocks_adv(VC1Context *v)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3683 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3684 int k, j;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3685 MpegEncContext *s = &v->s;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3686 int cbp, val;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3687 uint8_t *coded_val;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3688 int mb_pos;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3689 int mquant = v->pq;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3690 int mqdiff;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3691 int overlap;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3692 GetBitContext *gb = &s->gb;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3693
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3694 /* select codingmode used for VLC tables selection */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3695 switch(v->y_ac_table_index){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3696 case 0:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3697 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3698 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3699 case 1:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3700 v->codingset = CS_HIGH_MOT_INTRA;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3701 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3702 case 2:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3703 v->codingset = CS_MID_RATE_INTRA;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3704 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3705 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3706
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3707 switch(v->c_ac_table_index){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3708 case 0:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3709 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3710 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3711 case 1:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3712 v->codingset2 = CS_HIGH_MOT_INTER;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3713 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3714 case 2:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3715 v->codingset2 = CS_MID_RATE_INTER;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3716 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3717 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3718
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3719 //do frame decode
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3720 s->mb_x = s->mb_y = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3721 s->mb_intra = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3722 s->first_slice_line = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3723 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3724 for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3725 ff_init_block_index(s);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3726 ff_update_block_index(s);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3727 s->dsp.clear_blocks(s->block[0]);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3728 mb_pos = s->mb_x + s->mb_y * s->mb_stride;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3729 s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA;
3710
08280665be40 Set motion vectors used in B-frames to zero by default
kostya
parents: 3709
diff changeset
3730 s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
08280665be40 Set motion vectors used in B-frames to zero by default
kostya
parents: 3709
diff changeset
3731 s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3732
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3733 // do actual MB decoding and displaying
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3734 cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3735 if(v->acpred_is_raw)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3736 v->s.ac_pred = get_bits1(&v->s.gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3737 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3738 v->s.ac_pred = v->acpred_plane[mb_pos];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3739
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3740 if(v->condover == CONDOVER_SELECT) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3741 if(v->overflg_is_raw)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3742 overlap = get_bits1(&v->s.gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3743 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3744 overlap = v->over_flags_plane[mb_pos];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3745 } else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3746 overlap = (v->condover == CONDOVER_ALL);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3747
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3748 GET_MQUANT();
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3749
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3750 s->current_picture.qscale_table[mb_pos] = mquant;
4237
327e9d4572cb 100l: Initialize dc_scale with current quantizer for adv I frames
kostya
parents: 4236
diff changeset
3751 /* Set DC scale - y and c use the same */
327e9d4572cb 100l: Initialize dc_scale with current quantizer for adv I frames
kostya
parents: 4236
diff changeset
3752 s->y_dc_scale = s->y_dc_scale_table[mquant];
327e9d4572cb 100l: Initialize dc_scale with current quantizer for adv I frames
kostya
parents: 4236
diff changeset
3753 s->c_dc_scale = s->c_dc_scale_table[mquant];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3754
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3755 for(k = 0; k < 6; k++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3756 val = ((cbp >> (5 - k)) & 1);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3757
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3758 if (k < 4) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3759 int pred = vc1_coded_block_pred(&v->s, k, &coded_val);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3760 val = val ^ pred;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3761 *coded_val = val;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3762 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3763 cbp |= val << (5 - k);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3764
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3765 v->a_avail = !s->first_slice_line || (k==2 || k==3);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3766 v->c_avail = !!s->mb_x || (k==1 || k==3);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3767
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3768 vc1_decode_i_block_adv(v, s->block[k], k, val, (k<4)? v->codingset : v->codingset2, mquant);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3769
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3770 s->dsp.vc1_inv_trans_8x8(s->block[k]);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3771 for(j = 0; j < 64; j++) s->block[k][j] += 128;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3772 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3773
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3774 vc1_put_block(v, s->block);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3775 if(overlap) {
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3776 if(s->mb_x) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3777 s->dsp.vc1_h_overlap(s->dest[0], s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3778 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize);
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3779 if(!(s->flags & CODEC_FLAG_GRAY)) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3780 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3781 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize);
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3782 }
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3783 }
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3784 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3785 s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3786 if(!s->first_slice_line) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3787 s->dsp.vc1_v_overlap(s->dest[0], s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3788 s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3789 if(!(s->flags & CODEC_FLAG_GRAY)) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3790 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3791 s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3792 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3793 }
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3794 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize, s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3795 s->dsp.vc1_v_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3796 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3797 if(v->s.loop_filter) vc1_loop_filter_iblk(s, s->current_picture.qscale_table[mb_pos]);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3798
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3799 if(get_bits_count(&s->gb) > v->bits) {
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
3800 ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END));
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3801 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n", get_bits_count(&s->gb), v->bits);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3802 return;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3803 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3804 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3805 ff_draw_horiz_band(s, s->mb_y * 16, 16);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3806 s->first_slice_line = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3807 }
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
3808 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3809 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3810
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3811 static void vc1_decode_p_blocks(VC1Context *v)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3812 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3813 MpegEncContext *s = &v->s;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3814
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3815 /* select codingmode used for VLC tables selection */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3816 switch(v->c_ac_table_index){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3817 case 0:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3818 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3819 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3820 case 1:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3821 v->codingset = CS_HIGH_MOT_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3822 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3823 case 2:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3824 v->codingset = CS_MID_RATE_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3825 break;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3826 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3827
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3828 switch(v->c_ac_table_index){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3829 case 0:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3830 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3831 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3832 case 1:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3833 v->codingset2 = CS_HIGH_MOT_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3834 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3835 case 2:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3836 v->codingset2 = CS_MID_RATE_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3837 break;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3838 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3839
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3840 s->first_slice_line = 1;
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3841 memset(v->cbp_base, 0, sizeof(v->cbp_base[0])*2*s->mb_stride);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3842 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3843 for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3844 ff_init_block_index(s);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3845 ff_update_block_index(s);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3846 s->dsp.clear_blocks(s->block[0]);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3847
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3848 vc1_decode_p_mb(v);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3849 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) {
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
3850 ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END));
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3851 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n", get_bits_count(&s->gb), v->bits,s->mb_x,s->mb_y);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3852 return;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3853 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3854 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3855 memmove(v->cbp_base, v->cbp, sizeof(v->cbp_base[0])*s->mb_stride);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3856 ff_draw_horiz_band(s, s->mb_y * 16, 16);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3857 s->first_slice_line = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3858 }
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
3859 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3860 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3861
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3862 static void vc1_decode_b_blocks(VC1Context *v)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3863 {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3864 MpegEncContext *s = &v->s;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3865
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3866 /* select codingmode used for VLC tables selection */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3867 switch(v->c_ac_table_index){
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3868 case 0:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3869 v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3870 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3871 case 1:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3872 v->codingset = CS_HIGH_MOT_INTRA;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3873 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3874 case 2:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3875 v->codingset = CS_MID_RATE_INTRA;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3876 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3877 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3878
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3879 switch(v->c_ac_table_index){
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3880 case 0:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3881 v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3882 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3883 case 1:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3884 v->codingset2 = CS_HIGH_MOT_INTER;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3885 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3886 case 2:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3887 v->codingset2 = CS_MID_RATE_INTER;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3888 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3889 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3890
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3891 s->first_slice_line = 1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3892 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3893 for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3894 ff_init_block_index(s);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3895 ff_update_block_index(s);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3896 s->dsp.clear_blocks(s->block[0]);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3897
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3898 vc1_decode_b_mb(v);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3899 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) {
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
3900 ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END));
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3901 av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n", get_bits_count(&s->gb), v->bits,s->mb_x,s->mb_y);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3902 return;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3903 }
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
3904 if(v->s.loop_filter) vc1_loop_filter_iblk(s, s->current_picture.qscale_table[s->mb_x + s->mb_y *s->mb_stride]);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3905 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3906 ff_draw_horiz_band(s, s->mb_y * 16, 16);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3907 s->first_slice_line = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3908 }
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
3909 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3910 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3911
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3912 static void vc1_decode_skip_blocks(VC1Context *v)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3913 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3914 MpegEncContext *s = &v->s;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3915
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3916 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3917 s->first_slice_line = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3918 for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3919 s->mb_x = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3920 ff_init_block_index(s);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3921 ff_update_block_index(s);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3922 memcpy(s->dest[0], s->last_picture.data[0] + s->mb_y * 16 * s->linesize, s->linesize * 16);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3923 memcpy(s->dest[1], s->last_picture.data[1] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3924 memcpy(s->dest[2], s->last_picture.data[2] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3925 ff_draw_horiz_band(s, s->mb_y * 16, 16);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3926 s->first_slice_line = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3927 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
3928 s->pict_type = FF_P_TYPE;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3929 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3930
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3931 static void vc1_decode_blocks(VC1Context *v)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3932 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3933
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3934 v->s.esc3_level_length = 0;
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
3935 if(v->x8_type){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
3936 ff_intrax8_decode_picture(&v->x8, 2*v->pq+v->halfpq, v->pq*(!v->pquantizer) );
5894
ca2fcb451a7d add {} to make the else look a little more normal
michael
parents: 5893
diff changeset
3937 }else{
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3938
5893
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3939 switch(v->s.pict_type) {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
3940 case FF_I_TYPE:
4433
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3941 if(v->profile == PROFILE_ADVANCED)
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3942 vc1_decode_i_blocks_adv(v);
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3943 else
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3944 vc1_decode_i_blocks(v);
5893
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3945 break;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
3946 case FF_P_TYPE:
5893
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3947 if(v->p_frame_skipped)
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3948 vc1_decode_skip_blocks(v);
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3949 else
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3950 vc1_decode_p_blocks(v);
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3951 break;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
3952 case FF_B_TYPE:
5893
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3953 if(v->bi_type){
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3954 if(v->profile == PROFILE_ADVANCED)
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3955 vc1_decode_i_blocks_adv(v);
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3956 else
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3957 vc1_decode_i_blocks(v);
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3958 }else
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3959 vc1_decode_b_blocks(v);
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3960 break;
3bdbcfb7e497 indention
michael
parents: 5892
diff changeset
3961 }
5894
ca2fcb451a7d add {} to make the else look a little more normal
michael
parents: 5893
diff changeset
3962 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3963 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3964
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3965 /** Find VC-1 marker in buffer
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3966 * @return position where next marker starts or end of buffer if no marker found
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3967 */
6304
aurel
parents: 6290
diff changeset
3968 static av_always_inline const uint8_t* find_next_marker(const uint8_t *src, const uint8_t *end)
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3969 {
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3970 uint32_t mrk = 0xFFFFFFFF;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3971
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3972 if(end-src < 4) return end;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3973 while(src < end){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3974 mrk = (mrk << 8) | *src++;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3975 if(IS_MARKER(mrk))
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3976 return src-4;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3977 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3978 return end;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3979 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3980
6304
aurel
parents: 6290
diff changeset
3981 static av_always_inline int vc1_unescape_buffer(const uint8_t *src, int size, uint8_t *dst)
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3982 {
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3983 int dsize = 0, i;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3984
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3985 if(size < 4){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3986 for(dsize = 0; dsize < size; dsize++) *dst++ = *src++;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3987 return size;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3988 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3989 for(i = 0; i < size; i++, src++) {
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3990 if(src[0] == 3 && i >= 2 && !src[-1] && !src[-2] && i < size-1 && src[1] < 4) {
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3991 dst[dsize++] = src[1];
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3992 src++;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3993 i++;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3994 } else
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3995 dst[dsize++] = *src;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3996 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3997 return dsize;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3998 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3999
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4000 /** Initialize a VC1/WMV3 decoder
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4001 * @todo TODO: Handle VC-1 IDUs (Transport level?)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4002 * @todo TODO: Decypher remaining bits in extra_data
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4003 */
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4004 static av_cold int vc1_decode_init(AVCodecContext *avctx)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4005 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4006 VC1Context *v = avctx->priv_data;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4007 MpegEncContext *s = &v->s;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4008 GetBitContext gb;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4009
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4010 if (!avctx->extradata_size || !avctx->extradata) return -1;
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
4011 if (!(avctx->flags & CODEC_FLAG_GRAY))
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
4012 avctx->pix_fmt = PIX_FMT_YUV420P;
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
4013 else
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
4014 avctx->pix_fmt = PIX_FMT_GRAY8;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4015 v->s.avctx = avctx;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4016 avctx->flags |= CODEC_FLAG_EMU_EDGE;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4017 v->s.flags |= CODEC_FLAG_EMU_EDGE;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4018
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
4019 if(avctx->idct_algo==FF_IDCT_AUTO){
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
4020 avctx->idct_algo=FF_IDCT_WMV2;
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
4021 }
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
4022
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4023 if(ff_h263_decode_init(avctx) < 0)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4024 return -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4025 if (vc1_init_common(v) < 0) return -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4026
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4027 avctx->coded_width = avctx->width;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4028 avctx->coded_height = avctx->height;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4029 if (avctx->codec_id == CODEC_ID_WMV3)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4030 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4031 int count = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4032
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4033 // looks like WMV3 has a sequence header stored in the extradata
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4034 // advanced sequence header may be before the first frame
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4035 // the last byte of the extradata is a version number, 1 for the
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4036 // samples we can decode
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4037
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4038 init_get_bits(&gb, avctx->extradata, avctx->extradata_size*8);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4039
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4040 if (decode_sequence_header(avctx, &gb) < 0)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4041 return -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4042
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4043 count = avctx->extradata_size*8 - get_bits_count(&gb);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4044 if (count>0)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4045 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4046 av_log(avctx, AV_LOG_INFO, "Extra data: %i bits left, value: %X\n",
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4047 count, get_bits(&gb, count));
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4048 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4049 else if (count < 0)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4050 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4051 av_log(avctx, AV_LOG_INFO, "Read %i bits in overflow\n", -count);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4052 }
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4053 } else { // VC1/WVC1
6304
aurel
parents: 6290
diff changeset
4054 const uint8_t *start = avctx->extradata;
aurel
parents: 6290
diff changeset
4055 uint8_t *end = avctx->extradata + avctx->extradata_size;
aurel
parents: 6290
diff changeset
4056 const uint8_t *next;
aurel
parents: 6290
diff changeset
4057 int size, buf2_size;
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4058 uint8_t *buf2 = NULL;
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6304
diff changeset
4059 int seq_initialized = 0, ep_initialized = 0;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4060
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4061 if(avctx->extradata_size < 16) {
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4062 av_log(avctx, AV_LOG_ERROR, "Extradata size too small: %i\n", avctx->extradata_size);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4063 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4064 }
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4065
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4066 buf2 = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4067 if(start[0]) start++; // in WVC1 extradata first byte is its size
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4068 next = start;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4069 for(; next < end; start = next){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4070 next = find_next_marker(start + 4, end);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4071 size = next - start - 4;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4072 if(size <= 0) continue;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4073 buf2_size = vc1_unescape_buffer(start + 4, size, buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4074 init_get_bits(&gb, buf2, buf2_size * 8);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4075 switch(AV_RB32(start)){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4076 case VC1_CODE_SEQHDR:
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4077 if(decode_sequence_header(avctx, &gb) < 0){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4078 av_free(buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4079 return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4080 }
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6304
diff changeset
4081 seq_initialized = 1;
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4082 break;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4083 case VC1_CODE_ENTRYPOINT:
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4084 if(decode_entry_point(avctx, &gb) < 0){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4085 av_free(buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4086 return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4087 }
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6304
diff changeset
4088 ep_initialized = 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4089 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4090 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4091 }
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4092 av_free(buf2);
6350
8e63d869a904 typo fix: inited --> initialized
diego
parents: 6304
diff changeset
4093 if(!seq_initialized || !ep_initialized){
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4094 av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n");
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4095 return -1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4096 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4097 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4098 avctx->has_b_frames= !!(avctx->max_b_frames);
3707
e7f4366d9731 2989l: Set avctx->has_b_frames value in header and don't change it
kostya
parents: 3698
diff changeset
4099 s->low_delay = !avctx->has_b_frames;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4100
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4101 s->mb_width = (avctx->coded_width+15)>>4;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4102 s->mb_height = (avctx->coded_height+15)>>4;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4103
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4104 /* Allocate mb bitplanes */
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4105 v->mv_type_mb_plane = av_malloc(s->mb_stride * s->mb_height);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
4106 v->direct_mb_plane = av_malloc(s->mb_stride * s->mb_height);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4107 v->acpred_plane = av_malloc(s->mb_stride * s->mb_height);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4108 v->over_flags_plane = av_malloc(s->mb_stride * s->mb_height);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4109
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
4110 v->cbp_base = av_malloc(sizeof(v->cbp_base[0]) * 2 * s->mb_stride);
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
4111 v->cbp = v->cbp_base + s->mb_stride;
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
4112
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
4113 /* allocate block type info in that way so it could be used with s->block_index[] */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
4114 v->mb_type_base = av_malloc(s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride * (s->mb_height + 1) * 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
4115 v->mb_type[0] = v->mb_type_base + s->b8_stride + 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
4116 v->mb_type[1] = v->mb_type_base + s->b8_stride * (s->mb_height * 2 + 1) + s->mb_stride + 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
4117 v->mb_type[2] = v->mb_type[1] + s->mb_stride * (s->mb_height + 1);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
4118
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4119 /* Init coded blocks info */
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4120 if (v->profile == PROFILE_ADVANCED)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4121 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4122 // if (alloc_bitplane(&v->over_flags_plane, s->mb_width, s->mb_height) < 0)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4123 // return -1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4124 // if (alloc_bitplane(&v->ac_pred_plane, s->mb_width, s->mb_height) < 0)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4125 // return -1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4126 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4127
5887
83ac4620c6ed intrax8 decoder patch by "someone"
michael
parents: 5849
diff changeset
4128 ff_intrax8_common_init(&v->x8,s);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4129 return 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4130 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4131
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4132
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4133 /** Decode a VC1/WMV3 frame
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4134 * @todo TODO: Handle VC-1 IDUs (Transport level?)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4135 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4136 static int vc1_decode_frame(AVCodecContext *avctx,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4137 void *data, int *data_size,
6290
b7045a85cd7d some const
michael
parents: 6176
diff changeset
4138 const uint8_t *buf, int buf_size)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4139 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4140 VC1Context *v = avctx->priv_data;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4141 MpegEncContext *s = &v->s;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4142 AVFrame *pict = data;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4143 uint8_t *buf2 = NULL;
8631
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4144 const uint8_t *buf_vdpau = buf;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4145
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4146 /* no supplementary picture */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4147 if (buf_size == 0) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4148 /* special case for last picture */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4149 if (s->low_delay==0 && s->next_picture_ptr) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4150 *pict= *(AVFrame*)s->next_picture_ptr;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4151 s->next_picture_ptr= NULL;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4152
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4153 *data_size = sizeof(AVFrame);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4154 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4155
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4156 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4157 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4158
5127
4dbe6578f811 misc spelling fixes
diego
parents: 4966
diff changeset
4159 /* We need to set current_picture_ptr before reading the header,
5128
kostya
parents: 5127
diff changeset
4160 * otherwise we cannot store anything in there. */
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4161 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4162 int i= ff_find_unused_picture(s, 0);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4163 s->current_picture_ptr= &s->picture[i];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4164 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4165
8631
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4166 if (s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU){
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4167 if (v->profile < PROFILE_ADVANCED)
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4168 avctx->pix_fmt = PIX_FMT_VDPAU_WMV3;
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4169 else
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4170 avctx->pix_fmt = PIX_FMT_VDPAU_VC1;
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4171 }
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4172
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4173 //for advanced profile we may need to parse and unescape data
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4174 if (avctx->codec_id == CODEC_ID_VC1) {
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4175 int buf_size2 = 0;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4176 buf2 = av_mallocz(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4177
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4178 if(IS_MARKER(AV_RB32(buf))){ /* frame starts with marker and needs to be parsed */
6290
b7045a85cd7d some const
michael
parents: 6176
diff changeset
4179 const uint8_t *start, *end, *next;
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4180 int size;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4181
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4182 next = buf;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4183 for(start = buf, end = buf + buf_size; next < end; start = next){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4184 next = find_next_marker(start + 4, end);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4185 size = next - start - 4;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4186 if(size <= 0) continue;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4187 switch(AV_RB32(start)){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4188 case VC1_CODE_FRAME:
8631
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4189 if (s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4190 buf_vdpau = start;
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4191 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4192 break;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4193 case VC1_CODE_ENTRYPOINT: /* it should be before frame data */
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4194 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4195 init_get_bits(&s->gb, buf2, buf_size2*8);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4196 decode_entry_point(avctx, &s->gb);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4197 break;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4198 case VC1_CODE_SLICE:
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4199 av_log(avctx, AV_LOG_ERROR, "Sliced decoding is not implemented (yet)\n");
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4200 av_free(buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4201 return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4202 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4203 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4204 }else if(v->interlace && ((buf[0] & 0xC0) == 0xC0)){ /* WVC1 interlaced stores both fields divided by marker */
6304
aurel
parents: 6290
diff changeset
4205 const uint8_t *divider;
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4206
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4207 divider = find_next_marker(buf, buf + buf_size);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4208 if((divider == (buf + buf_size)) || AV_RB32(divider) != VC1_CODE_FIELD){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4209 av_log(avctx, AV_LOG_ERROR, "Error in WVC1 interlaced frame\n");
7300
7e806e21c193 Fix a mem leak in vc1_decode_frame().
benoit
parents: 7136
diff changeset
4210 av_free(buf2);
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4211 return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4212 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4213
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4214 buf_size2 = vc1_unescape_buffer(buf, divider - buf, buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4215 // TODO
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4216 av_free(buf2);return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4217 }else{
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4218 buf_size2 = vc1_unescape_buffer(buf, buf_size, buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4219 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4220 init_get_bits(&s->gb, buf2, buf_size2*8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4221 } else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4222 init_get_bits(&s->gb, buf, buf_size*8);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4223 // do parse frame header
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4224 if(v->profile < PROFILE_ADVANCED) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4225 if(vc1_parse_frame_header(v, &s->gb) == -1) {
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4226 av_free(buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4227 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4228 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4229 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4230 if(vc1_parse_frame_header_adv(v, &s->gb) == -1) {
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4231 av_free(buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4232 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4233 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4234 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4235
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
4236 if(s->pict_type != FF_I_TYPE && !v->res_rtm_flag){
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4237 av_free(buf2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4238 return -1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4239 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4240
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4241 // for hurry_up==5
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4242 s->current_picture.pict_type= s->pict_type;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
4243 s->current_picture.key_frame= s->pict_type == FF_I_TYPE;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4244
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4245 /* skip B-frames if we don't have reference frames */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
4246 if(s->last_picture_ptr==NULL && (s->pict_type==FF_B_TYPE || s->dropable)){
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4247 av_free(buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4248 return -1;//buf_size;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4249 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4250 /* skip b frames if we are in a hurry */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
4251 if(avctx->hurry_up && s->pict_type==FF_B_TYPE) return -1;//buf_size;
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
4252 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE)
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
4253 || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE)
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4254 || avctx->skip_frame >= AVDISCARD_ALL) {
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4255 av_free(buf2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4256 return buf_size;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4257 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4258 /* skip everything if we are in a hurry>=5 */
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4259 if(avctx->hurry_up>=5) {
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4260 av_free(buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4261 return -1;//buf_size;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4262 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4263
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4264 if(s->next_p_frame_damaged){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
4265 if(s->pict_type==FF_B_TYPE)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4266 return buf_size;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4267 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4268 s->next_p_frame_damaged=0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4269 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4270
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4271 if(MPV_frame_start(s, avctx) < 0) {
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4272 av_free(buf2);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4273 return -1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4274 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4275
5684
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
4276 s->me.qpel_put= s->dsp.put_qpel_pixels_tab;
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
4277 s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab;
1eb243819e08 Enable error resilience in WMV3/VC-1 decoder
kostya
parents: 5683
diff changeset
4278
8631
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4279 if ((CONFIG_VC1_VDPAU_DECODER || CONFIG_WMV3_VDPAU_DECODER)
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4280 &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4281 ff_vdpau_vc1_decode_picture(s, buf_vdpau, (buf + buf_size) - buf_vdpau);
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4282 else {
8632
6fa5b0727ddd Cosmetics: Fix indentation after last commit.
cehoyos
parents: 8631
diff changeset
4283 ff_er_frame_start(s);
6fa5b0727ddd Cosmetics: Fix indentation after last commit.
cehoyos
parents: 8631
diff changeset
4284
6fa5b0727ddd Cosmetics: Fix indentation after last commit.
cehoyos
parents: 8631
diff changeset
4285 v->bits = buf_size * 8;
6fa5b0727ddd Cosmetics: Fix indentation after last commit.
cehoyos
parents: 8631
diff changeset
4286 vc1_decode_blocks(v);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4287 //av_log(s->avctx, AV_LOG_INFO, "Consumed %i/%i bits\n", get_bits_count(&s->gb), buf_size*8);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4288 // if(get_bits_count(&s->gb) > buf_size * 8)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4289 // return -1;
8632
6fa5b0727ddd Cosmetics: Fix indentation after last commit.
cehoyos
parents: 8631
diff changeset
4290 ff_er_frame_end(s);
8631
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4291 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4292
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4293 MPV_frame_end(s);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4294
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4295 assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4296 assert(s->current_picture.pict_type == s->pict_type);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6350
diff changeset
4297 if (s->pict_type == FF_B_TYPE || s->low_delay) {
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4298 *pict= *(AVFrame*)s->current_picture_ptr;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4299 } else if (s->last_picture_ptr != NULL) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4300 *pict= *(AVFrame*)s->last_picture_ptr;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4301 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4302
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4303 if(s->last_picture_ptr || s->low_delay){
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4304 *data_size = sizeof(AVFrame);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4305 ff_print_debug_info(s, pict);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4306 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4307
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4308 /* Return the Picture timestamp as the frame number */
5964
34f551bd0509 Fix alignment broke by my last patch
vitor
parents: 5963
diff changeset
4309 /* we subtract 1 because it is added on utils.c */
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4310 avctx->frame_number = s->picture_number - 1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4311
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4312 av_free(buf2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4313 return buf_size;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4314 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4315
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4316
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4317 /** Close a VC1/WMV3 decoder
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4318 * @warning Initial try at using MpegEncContext stuff
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4319 */
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
4320 static av_cold int vc1_decode_end(AVCodecContext *avctx)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4321 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4322 VC1Context *v = avctx->priv_data;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4323
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4324 av_freep(&v->hrd_rate);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4325 av_freep(&v->hrd_buffer);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4326 MPV_common_end(&v->s);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4327 av_freep(&v->mv_type_mb_plane);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
4328 av_freep(&v->direct_mb_plane);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4329 av_freep(&v->acpred_plane);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4330 av_freep(&v->over_flags_plane);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
4331 av_freep(&v->mb_type_base);
7355
5719e2c85aa3 In-loop deblocking filter for VC-1 decoder
kostya
parents: 7300
diff changeset
4332 av_freep(&v->cbp_base);
6176
1d735690e172 Correctly clean up IntraX8Context upon codec close.
andoma
parents: 6150
diff changeset
4333 ff_intrax8_common_end(&v->x8);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4334 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4335 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4336
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4337
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4338 AVCodec vc1_decoder = {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4339 "vc1",
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4340 CODEC_TYPE_VIDEO,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4341 CODEC_ID_VC1,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4342 sizeof(VC1Context),
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4343 vc1_decode_init,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4344 NULL,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4345 vc1_decode_end,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4346 vc1_decode_frame,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4347 CODEC_CAP_DELAY,
6712
5b3acf9fd50a Add long names to AVCodec declarations.
diego
parents: 6517
diff changeset
4348 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6903
diff changeset
4349 .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4350 };
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4351
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4352 AVCodec wmv3_decoder = {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4353 "wmv3",
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4354 CODEC_TYPE_VIDEO,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4355 CODEC_ID_WMV3,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4356 sizeof(VC1Context),
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4357 vc1_decode_init,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4358 NULL,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4359 vc1_decode_end,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4360 vc1_decode_frame,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4361 CODEC_CAP_DELAY,
6712
5b3acf9fd50a Add long names to AVCodec declarations.
diego
parents: 6517
diff changeset
4362 NULL,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6903
diff changeset
4363 .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4364 };
8631
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4365
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4366 #if CONFIG_WMV3_VDPAU_DECODER
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4367 AVCodec wmv3_vdpau_decoder = {
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4368 "wmv3_vdpau",
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4369 CODEC_TYPE_VIDEO,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4370 CODEC_ID_WMV3,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4371 sizeof(VC1Context),
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4372 vc1_decode_init,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4373 NULL,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4374 vc1_decode_end,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4375 vc1_decode_frame,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4376 CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4377 NULL,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4378 .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"),
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4379 };
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4380 #endif
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4381
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4382 #if CONFIG_VC1_VDPAU_DECODER
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4383 AVCodec vc1_vdpau_decoder = {
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4384 "vc1_vdpau",
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4385 CODEC_TYPE_VIDEO,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4386 CODEC_ID_VC1,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4387 sizeof(VC1Context),
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4388 vc1_decode_init,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4389 NULL,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4390 vc1_decode_end,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4391 vc1_decode_frame,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4392 CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4393 NULL,
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4394 .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"),
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4395 };
2d7269e13a8d Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can
cehoyos
parents: 8627
diff changeset
4396 #endif