annotate vc1.c @ 5651:ab023c9f03d0 libavcodec

store halfpel filter coefficients in the header as well as the flag for diagonal interpolation the primary reason for this change is that previously MC up to 1/4 pel matched H.264 exactly and that increases the risk of stumbling over patents secondly this allows 0.10 db or more quality gain by choosing a longer filter and the filter could also be chosen optimally for each frame though that of course would cause speed loss at the decoder and encoder side ...
author michael
date Sat, 08 Sep 2007 14:51:13 +0000
parents d92fa6e5fc8c
children 8bf94c994691
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 /**
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
24 * @file vc1.c
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"
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
36
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
37 #undef NDEBUG
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
38 #include <assert.h>
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 #define MB_INTRA_VLC_BITS 9
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
41 #define DC_VLC_BITS 9
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
42 #define AC_VLC_BITS 9
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
43 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
44
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
45
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
46 static inline int decode210(GetBitContext *gb){
5228
3d124a8b7a76 Drop redundant assignment and variable
kostya
parents: 5215
diff changeset
47 if (get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
48 return 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
49 else
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
50 return 2 - get_bits1(gb);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
51 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
52
3359
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 * 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
55 * @param v The VC1Context to initialize
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
56 * @return Status
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
57 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
58 static int vc1_init_common(VC1Context *v)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
59 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
60 static int done = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
61 int i = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
62
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
63 v->hrd_rate = v->hrd_buffer = NULL;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
64
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
65 /* VLC tables */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
66 if(!done)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
67 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
68 done = 1;
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
69 init_vlc(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
70 ff_vc1_bfraction_bits, 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
71 ff_vc1_bfraction_codes, 1, 1, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
72 init_vlc(&ff_vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
73 ff_vc1_norm2_bits, 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
74 ff_vc1_norm2_codes, 1, 1, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
75 init_vlc(&ff_vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
76 ff_vc1_norm6_bits, 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
77 ff_vc1_norm6_codes, 2, 2, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
78 init_vlc(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
79 ff_vc1_imode_bits, 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
80 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
81 for (i=0; i<3; i++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
82 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
83 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
84 ff_vc1_ttmb_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
85 ff_vc1_ttmb_codes[i], 2, 2, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
86 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
87 ff_vc1_ttblk_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
88 ff_vc1_ttblk_codes[i], 1, 1, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
89 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
90 ff_vc1_subblkpat_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
91 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
92 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
93 for(i=0; i<4; i++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
94 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
95 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
96 ff_vc1_4mv_block_pattern_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
97 ff_vc1_4mv_block_pattern_codes[i], 1, 1, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
98 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
99 ff_vc1_cbpcy_p_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
100 ff_vc1_cbpcy_p_codes[i], 2, 2, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
101 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
102 ff_vc1_mv_diff_bits[i], 1, 1,
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
103 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
104 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
105 for(i=0; i<8; i++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
106 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
107 &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
108 &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
109 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
110 &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
111 &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
112 }
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 /* Other defaults */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
115 v->pq = -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
116 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
117
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
118 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
119 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
120
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 /**
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
123 * @defgroup bitplane VC9 Bitplane decoding
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
124 * @see 8.7, p56
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
125 * @{
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
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
128 /** @addtogroup bitplane
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
129 * Imode types
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
130 * @{
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
131 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
132 enum Imode {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
133 IMODE_RAW,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
134 IMODE_NORM2,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
135 IMODE_DIFF2,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
136 IMODE_NORM6,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
137 IMODE_DIFF6,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
138 IMODE_ROWSKIP,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
139 IMODE_COLSKIP
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
140 };
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
141 /** @} */ //imode defines
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
142
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
143 /** 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
144 * @param plane Buffer to store decoded bits
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
145 * @param[in] width Width of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
146 * @param[in] height Height of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
147 * @param[in] stride of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
148 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
149 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
150 int x, y;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
151
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
152 for (y=0; y<height; y++){
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
153 if (!get_bits1(gb)) //rowskip
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
154 memset(plane, 0, width);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
155 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
156 for (x=0; x<width; x++)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
157 plane[x] = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
158 plane += stride;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
159 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
160 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
161
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
162 /** 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
163 * @param plane Buffer to store decoded bits
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
164 * @param[in] width Width of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
165 * @param[in] height Height of this buffer
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
166 * @param[in] stride of this buffer
5299
4623928e3b9e Replace non-existing @fixme doxygen tags with @todo.
diego
parents: 5228
diff changeset
167 * @todo FIXME: Optimize
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
168 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
169 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
170 int x, y;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
171
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
172 for (x=0; x<width; x++){
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
173 if (!get_bits1(gb)) //colskip
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
174 for (y=0; y<height; y++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
175 plane[y*stride] = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
176 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
177 for (y=0; y<height; y++)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
178 plane[y*stride] = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
179 plane ++;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
180 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
181 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
182
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
183 /** Decode a bitplane's bits
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
184 * @param bp Bitplane where to store the decode bits
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
185 * @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
186 * @return Status
5299
4623928e3b9e Replace non-existing @fixme doxygen tags with @todo.
diego
parents: 5228
diff changeset
187 * @todo FIXME: Optimize
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
188 */
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
189 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
190 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
191 GetBitContext *gb = &v->s.gb;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
192
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
193 int imode, x, y, code, offset;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
194 uint8_t invert, *planep = data;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
195 int width, height, stride;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
196
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
197 width = v->s.mb_width;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
198 height = v->s.mb_height;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
199 stride = v->s.mb_stride;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
200 invert = get_bits1(gb);
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
201 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
202
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
203 *raw_flag = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
204 switch (imode)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
205 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
206 case IMODE_RAW:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
207 //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
208 *raw_flag = 1; //invert ignored
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
209 return invert;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
210 case IMODE_DIFF2:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
211 case IMODE_NORM2:
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
212 if ((height * width) & 1)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
213 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
214 *planep++ = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
215 offset = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
216 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
217 else offset = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
218 // decode bitplane as one long line
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
219 for (y = offset; y < height * width; y += 2) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
220 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
221 *planep++ = code & 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
222 offset++;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
223 if(offset == width) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
224 offset = 0;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
225 planep += stride - width;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
226 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
227 *planep++ = code >> 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
228 offset++;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
229 if(offset == width) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
230 offset = 0;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
231 planep += stride - width;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
232 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
233 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
234 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
235 case IMODE_DIFF6:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
236 case IMODE_NORM6:
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
237 if(!(height % 3) && (width % 3)) { // use 2x3 decoding
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
238 for(y = 0; y < height; y+= 3) {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
239 for(x = width & 1; x < width; x += 2) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
240 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
241 if(code < 0){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
242 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
243 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
244 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
245 planep[x + 0] = (code >> 0) & 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
246 planep[x + 1] = (code >> 1) & 1;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
247 planep[x + 0 + stride] = (code >> 2) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
248 planep[x + 1 + stride] = (code >> 3) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
249 planep[x + 0 + stride * 2] = (code >> 4) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
250 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
251 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
252 planep += stride * 3;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
253 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
254 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
255 } else { // 3x2
3405
58c4fd135462 Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents: 3404
diff changeset
256 planep += (height & 1) * stride;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
257 for(y = height & 1; y < height; y += 2) {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
258 for(x = width % 3; x < width; x += 3) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
259 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
260 if(code < 0){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
261 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
262 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
263 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
264 planep[x + 0] = (code >> 0) & 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
265 planep[x + 1] = (code >> 1) & 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
266 planep[x + 2] = (code >> 2) & 1;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
267 planep[x + 0 + stride] = (code >> 3) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
268 planep[x + 1 + stride] = (code >> 4) & 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
269 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
270 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
271 planep += stride * 2;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
272 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
273 x = width % 3;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
274 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
275 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
276 }
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_ROWSKIP:
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
279 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
280 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
281 case IMODE_COLSKIP:
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
282 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
283 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
284 default: break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
285 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
286
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
287 /* Applying diff operator */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
288 if (imode == IMODE_DIFF2 || imode == IMODE_DIFF6)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
289 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
290 planep = data;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
291 planep[0] ^= invert;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
292 for (x=1; x<width; x++)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
293 planep[x] ^= planep[x-1];
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
294 for (y=1; y<height; y++)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
295 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
296 planep += stride;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
297 planep[0] ^= planep[-stride];
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
298 for (x=1; x<width; x++)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
299 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
300 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
301 else planep[x] ^= planep[x-1];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
302 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
303 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
304 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
305 else if (invert)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
306 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
307 planep = data;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
308 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
309 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
310 return (imode<<1) + invert;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
311 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
312
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
313 /** @} */ //Bitplane group
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
314
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
315 /***********************************************************************/
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
316 /** VOP Dquant decoding
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
317 * @param v VC-1 Context
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
318 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
319 static int vop_dquant_decoding(VC1Context *v)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
320 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
321 GetBitContext *gb = &v->s.gb;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
322 int pqdiff;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
323
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
324 //variable size
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
325 if (v->dquant == 2)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
326 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
327 pqdiff = get_bits(gb, 3);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
328 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
329 else v->altpq = v->pq + pqdiff + 1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
330 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
331 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
332 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
333 v->dquantfrm = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
334 if ( v->dquantfrm )
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
335 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
336 v->dqprofile = get_bits(gb, 2);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
337 switch (v->dqprofile)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
338 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
339 case DQPROFILE_SINGLE_EDGE:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
340 case DQPROFILE_DOUBLE_EDGES:
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
341 v->dqsbedge = get_bits(gb, 2);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
342 break;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
343 case DQPROFILE_ALL_MBS:
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
344 v->dqbilevel = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
345 default: break; //Forbidden ?
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
346 }
3451
45724ba8d666 Fix mquant selection for ALL_MBS mode
kostya
parents: 3450
diff changeset
347 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
348 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
349 pqdiff = get_bits(gb, 3);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
350 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
351 else v->altpq = v->pq + pqdiff + 1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
352 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
353 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
354 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
355 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
356 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
357
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
358 /** Put block onto picture
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
359 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
360 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
361 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
362 uint8_t *Y;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
363 int ys, us, vs;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
364 DSPContext *dsp = &v->s.dsp;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
365
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
366 if(v->rangeredfrm) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
367 int i, j, k;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
368 for(k = 0; k < 6; k++)
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
369 for(j = 0; j < 8; j++)
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
370 for(i = 0; i < 8; i++)
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
371 block[k][i + j*8] = ((block[k][i + j*8] - 128) << 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
372
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
373 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
374 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
375 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
376 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
377 Y = v->s.dest[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
378
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
379 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
380 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
381 Y += ys * 8;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
382 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
383 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
384
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
385 if(!(v->s.flags & CODEC_FLAG_GRAY)) {
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
386 dsp->put_pixels_clamped(block[4], v->s.dest[1], us);
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
387 dsp->put_pixels_clamped(block[5], v->s.dest[2], vs);
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
388 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
389 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
390
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
391 /** Do motion compensation over 1 macroblock
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
392 * 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
393 */
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
394 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
395 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
396 MpegEncContext *s = &v->s;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
397 DSPContext *dsp = &v->s.dsp;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
398 uint8_t *srcY, *srcU, *srcV;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
399 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
400
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
401 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
402
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
403 mx = s->mv[dir][0][0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
404 my = s->mv[dir][0][1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
405
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
406 // store motion vectors for further use in B frames
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
407 if(s->pict_type == P_TYPE) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
408 s->current_picture.motion_val[1][s->block_index[0]][0] = mx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
409 s->current_picture.motion_val[1][s->block_index[0]][1] = my;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
410 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
411 uvmx = (mx + ((mx & 3) == 3)) >> 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
412 uvmy = (my + ((my & 3) == 3)) >> 1;
4258
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
413 if(v->fastuvmc) {
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
414 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
415 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
416 }
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
417 if(!dir) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
418 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
419 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
420 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
421 } else {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
422 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
423 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
424 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
425 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
426
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
427 src_x = s->mb_x * 16 + (mx >> 2);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
428 src_y = s->mb_y * 16 + (my >> 2);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
429 uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
430 uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
431
4681
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
432 if(v->profile != PROFILE_ADVANCED){
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
433 src_x = av_clip( src_x, -16, s->mb_width * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
434 src_y = av_clip( src_y, -16, s->mb_height * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
435 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
436 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
437 }else{
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
438 src_x = av_clip( src_x, -17, s->avctx->coded_width);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
439 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
440 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
441 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
442 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
443
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
444 srcY += src_y * s->linesize + src_x;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
445 srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
446 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
447
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
448 /* for grayscale we should not try to read from unknown area */
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
449 if(s->flags & CODEC_FLAG_GRAY) {
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
450 srcU = s->edge_emu_buffer + 18 * s->linesize;
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
451 srcV = s->edge_emu_buffer + 18 * s->linesize;
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
452 }
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
453
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
454 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
455 || (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
456 || (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
457 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
458
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
459 srcY -= s->mspel * (1 + s->linesize);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
460 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
461 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
462 srcY = s->edge_emu_buffer;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
463 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
464 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
465 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
466 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
467 srcU = uvbuf;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
468 srcV = uvbuf + 16;
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
469 /* if we deal with range reduction we need to scale source blocks */
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
470 if(v->rangeredfrm) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
471 int i, j;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
472 uint8_t *src, *src2;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
473
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
474 src = srcY;
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
475 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
476 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
477 src += s->linesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
478 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
479 src = srcU; src2 = srcV;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
480 for(j = 0; j < 9; j++) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
481 for(i = 0; i < 9; i++) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
482 src[i] = ((src[i] - 128) >> 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
483 src2[i] = ((src2[i] - 128) >> 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
484 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
485 src += s->uvlinesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
486 src2 += s->uvlinesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
487 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
488 }
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
489 /* if we deal with intensity compensation we need to scale source blocks */
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
490 if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
491 int i, j;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
492 uint8_t *src, *src2;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
493
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
494 src = srcY;
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
495 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
496 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
497 src += s->linesize;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
498 }
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
499 src = srcU; src2 = srcV;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
500 for(j = 0; j < 9; j++) {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
501 for(i = 0; i < 9; i++) {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
502 src[i] = v->lutuv[src[i]];
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
503 src2[i] = v->lutuv[src2[i]];
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
504 }
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
505 src += s->uvlinesize;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
506 src2 += s->uvlinesize;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
507 }
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
508 }
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
509 srcY += s->mspel * (1 + s->linesize);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
510 }
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
511
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
512 if(s->mspel) {
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
513 dxy = ((my & 3) << 2) | (mx & 3);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
514 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
515 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
516 srcY += s->linesize * 8;
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
517 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
518 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
519 } else { // hpel mc - always used for luma
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
520 dxy = (my & 2) | ((mx & 2) >> 1);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
521
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
522 if(!v->rnd)
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
523 dsp->put_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16);
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
524 else
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
525 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
526 }
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
527
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
528 if(s->flags & CODEC_FLAG_GRAY) return;
3655
8dbf728f3967 Spelling
kostya
parents: 3654
diff changeset
529 /* Chroma MC always uses qpel bilinear */
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
530 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
531 uvmx = (uvmx&3)<<1;
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
532 uvmy = (uvmy&3)<<1;
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
533 if(!v->rnd){
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
534 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
535 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
536 }else{
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
537 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
538 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
539 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
540 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
541
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
542 /** Do motion compensation for 4-MV macroblock - luminance block
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
543 */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
544 static void vc1_mc_4mv_luma(VC1Context *v, int n)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
545 {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
546 MpegEncContext *s = &v->s;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
547 DSPContext *dsp = &v->s.dsp;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
548 uint8_t *srcY;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
549 int dxy, mx, my, src_x, src_y;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
550 int off;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
551
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
552 if(!v->s.last_picture.data[0])return;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
553 mx = s->mv[0][n][0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
554 my = s->mv[0][n][1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
555 srcY = s->last_picture.data[0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
556
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
557 off = s->linesize * 4 * (n&2) + (n&1) * 8;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
558
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
559 src_x = s->mb_x * 16 + (n&1) * 8 + (mx >> 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
560 src_y = s->mb_y * 16 + (n&2) * 4 + (my >> 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
561
4681
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
562 if(v->profile != PROFILE_ADVANCED){
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
563 src_x = av_clip( src_x, -16, s->mb_width * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
564 src_y = av_clip( src_y, -16, s->mb_height * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
565 }else{
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
566 src_x = av_clip( src_x, -17, s->avctx->coded_width);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
567 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
568 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
569
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
570 srcY += src_y * s->linesize + src_x;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
571
3548
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
572 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
573 || (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
574 || (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
575 srcY -= s->mspel * (1 + s->linesize);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
576 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
577 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
578 srcY = s->edge_emu_buffer;
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
579 /* if we deal with range reduction we need to scale source blocks */
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
580 if(v->rangeredfrm) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
581 int i, j;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
582 uint8_t *src;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
583
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
584 src = srcY;
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
585 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
586 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
587 src += s->linesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
588 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
589 }
3548
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
590 /* 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
591 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
592 int i, j;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
593 uint8_t *src;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
594
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
595 src = srcY;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
596 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
597 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
598 src += s->linesize;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
599 }
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
600 }
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
601 srcY += s->mspel * (1 + s->linesize);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
602 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
603
3528
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
604 if(s->mspel) {
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
605 dxy = ((my & 3) << 2) | (mx & 3);
79ad5cd43686 Use bicubic MC (should also remove those ringing artifacts) when needed
kostya
parents: 3527
diff changeset
606 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
607 } else { // hpel mc - always used for luma
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
608 dxy = (my & 2) | ((mx & 2) >> 1);
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
609 if(!v->rnd)
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
610 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
611 else
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
612 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
613 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
614 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
615
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
616 static inline int median4(int a, int b, int c, int d)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
617 {
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
618 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
619 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
620 else return (FFMIN(b, c) + FFMAX(a, d)) / 2;
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
621 } 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
622 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
623 else return (FFMIN(a, c) + FFMAX(b, d)) / 2;
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
624 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
625 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
626
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
627
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
628 /** Do motion compensation for 4-MV macroblock - both chroma blocks
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
629 */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
630 static void vc1_mc_4mv_chroma(VC1Context *v)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
631 {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
632 MpegEncContext *s = &v->s;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
633 DSPContext *dsp = &v->s.dsp;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
634 uint8_t *srcU, *srcV;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
635 int uvdxy, uvmx, uvmy, uvsrc_x, uvsrc_y;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
636 int i, idx, tx = 0, ty = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
637 int mvx[4], mvy[4], intra[4];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
638 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
639
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
640 if(!v->s.last_picture.data[0])return;
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
641 if(s->flags & CODEC_FLAG_GRAY) return;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
642
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
643 for(i = 0; i < 4; i++) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
644 mvx[i] = s->mv[0][i][0];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
645 mvy[i] = s->mv[0][i][1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
646 intra[i] = v->mb_type[0][s->block_index[i]];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
647 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
648
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
649 /* calculate chroma MV vector from four luma MVs */
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
650 idx = (intra[3] << 3) | (intra[2] << 2) | (intra[1] << 1) | intra[0];
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
651 if(!idx) { // all blocks are inter
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
652 tx = median4(mvx[0], mvx[1], mvx[2], mvx[3]);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
653 ty = median4(mvy[0], mvy[1], mvy[2], mvy[3]);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
654 } else if(count[idx] == 1) { // 3 inter blocks
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
655 switch(idx) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
656 case 0x1:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
657 tx = mid_pred(mvx[1], mvx[2], mvx[3]);
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
658 ty = mid_pred(mvy[1], mvy[2], mvy[3]);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
659 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
660 case 0x2:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
661 tx = mid_pred(mvx[0], mvx[2], mvx[3]);
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
662 ty = mid_pred(mvy[0], mvy[2], mvy[3]);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
663 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
664 case 0x4:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
665 tx = mid_pred(mvx[0], mvx[1], mvx[3]);
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
666 ty = mid_pred(mvy[0], mvy[1], mvy[3]);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
667 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
668 case 0x8:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
669 tx = mid_pred(mvx[0], mvx[1], mvx[2]);
3419
b4363f96013d Fix one case of choosing MV for chroma
kostya
parents: 3406
diff changeset
670 ty = mid_pred(mvy[0], mvy[1], mvy[2]);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
671 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
672 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
673 } else if(count[idx] == 2) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
674 int t1 = 0, t2 = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
675 for(i=0; i<3;i++) if(!intra[i]) {t1 = i; break;}
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
676 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
677 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
678 ty = (mvy[t1] + mvy[t2]) / 2;
4683
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
679 } else {
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
680 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
681 s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
682 return; //no need to do MC for inter blocks
4683
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
683 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
684
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
685 s->current_picture.motion_val[1][s->block_index[0]][0] = tx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
686 s->current_picture.motion_val[1][s->block_index[0]][1] = ty;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
687 uvmx = (tx + ((tx&3) == 3)) >> 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
688 uvmy = (ty + ((ty&3) == 3)) >> 1;
4258
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
689 if(v->fastuvmc) {
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
690 uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
691 uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
692 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
693
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
694 uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
695 uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
696
4681
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
697 if(v->profile != PROFILE_ADVANCED){
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
698 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
699 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
700 }else{
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
701 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
702 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
703 }
4680
71c1e1171e83 Proper handling of motion vectors for adv. profile
kostya
parents: 4605
diff changeset
704
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
705 srcU = s->last_picture.data[1] + uvsrc_y * s->uvlinesize + uvsrc_x;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
706 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
707 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
708 || (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9
3511
f88787aeed6b Correct edge MC for chroma
kostya
parents: 3510
diff changeset
709 || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9){
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
710 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
711 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
712 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
713 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
714 srcU = s->edge_emu_buffer;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
715 srcV = s->edge_emu_buffer + 16;
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
716
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
717 /* if we deal with range reduction we need to scale source blocks */
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
718 if(v->rangeredfrm) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
719 int i, j;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
720 uint8_t *src, *src2;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
721
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
722 src = srcU; src2 = srcV;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
723 for(j = 0; j < 9; j++) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
724 for(i = 0; i < 9; i++) {
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
725 src[i] = ((src[i] - 128) >> 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
726 src2[i] = ((src2[i] - 128) >> 1) + 128;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
727 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
728 src += s->uvlinesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
729 src2 += s->uvlinesize;
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
730 }
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
731 }
3548
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
732 /* 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
733 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
734 int i, j;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
735 uint8_t *src, *src2;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
736
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
737 src = srcU; src2 = srcV;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
738 for(j = 0; j < 9; j++) {
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
739 for(i = 0; i < 9; i++) {
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
740 src[i] = v->lutuv[src[i]];
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
741 src2[i] = v->lutuv[src2[i]];
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
742 }
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
743 src += s->uvlinesize;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
744 src2 += s->uvlinesize;
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
745 }
f7b09917c680 100l: intensity compensation must be also done in 4-MV mode
kostya
parents: 3538
diff changeset
746 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
747 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
748
3655
8dbf728f3967 Spelling
kostya
parents: 3654
diff changeset
749 /* Chroma MC always uses qpel bilinear */
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
750 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
751 uvmx = (uvmx&3)<<1;
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
752 uvmy = (uvmy&3)<<1;
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
753 if(!v->rnd){
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
754 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
755 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
756 }else{
de842f000384 Replace usage of put_*_vc1_qpel_pixels_tab with put_*_h264_chroma_pixels_tab
kostya
parents: 3656
diff changeset
757 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
758 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
759 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
760 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
761
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
762 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
763
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
764 /**
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
765 * Decode Simple/Main Profiles sequence header
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
766 * @see Figure 7-8, p16-17
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
767 * @param avctx Codec context
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
768 * @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
769 * @return Status
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
770 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
771 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
772 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
773 VC1Context *v = avctx->priv_data;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
774
3692
7857ae840b0b Don't print header bits by default
kostya
parents: 3691
diff changeset
775 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
776 v->profile = get_bits(gb, 2);
4604
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
777 if (v->profile == PROFILE_COMPLEX)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
778 {
4604
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
779 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
780 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
781
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
782 if (v->profile == PROFILE_ADVANCED)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
783 {
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
784 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
785 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
786 else
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
787 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
788 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
789 if (v->res_sm)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
790 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
791 av_log(avctx, AV_LOG_ERROR,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
792 "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
793 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
794 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
795 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
796
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
797 // (fps-2)/4 (->30)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
798 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
799 // (bitrate-32kbps)/64kbps
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
800 v->bitrtq_postproc = get_bits(gb, 5); //common
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
801 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
802 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
803 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
804 av_log(avctx, AV_LOG_ERROR,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
805 "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
806 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
807
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
808 v->res_x8 = get_bits1(gb); //reserved
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
809 if (v->res_x8)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
810 {
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
811 av_log(avctx, AV_LOG_ERROR,
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
812 "1 for reserved RES_X8 is forbidden\n");
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
813 //return -1;
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
814 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
815 v->multires = get_bits1(gb);
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
816 v->res_fasttx = get_bits1(gb);
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
817 if (!v->res_fasttx)
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
818 {
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
819 av_log(avctx, AV_LOG_ERROR,
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
820 "0 for reserved RES_FASTTX is forbidden\n");
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
821 //return -1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
822 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
823
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
824 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
825 if (!v->profile && !v->fastuvmc)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
826 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
827 av_log(avctx, AV_LOG_ERROR,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
828 "FASTUVMC unavailable in Simple Profile\n");
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
829 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
830 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
831 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
832 if (!v->profile && v->extended_mv)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
833 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
834 av_log(avctx, AV_LOG_ERROR,
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
835 "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
836 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
837 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
838 v->dquant = get_bits(gb, 2); //common
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
839 v->vstransform = get_bits1(gb); //common
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
840
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
841 v->res_transtab = get_bits1(gb);
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
842 if (v->res_transtab)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
843 {
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
844 av_log(avctx, AV_LOG_ERROR,
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
845 "1 for reserved RES_TRANSTAB is forbidden\n");
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
846 return -1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
847 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
848
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
849 v->overlap = get_bits1(gb); //common
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
850
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
851 v->s.resync_marker = get_bits1(gb);
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
852 v->rangered = get_bits1(gb);
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
853 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
854 {
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
855 av_log(avctx, AV_LOG_INFO,
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
856 "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
857 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
858
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
859 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
860 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
861
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
862 v->finterpflag = get_bits1(gb); //common
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
863 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
864 if (!v->res_rtm_flag)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
865 {
3538
f26bf13bbb69 Don't try to decode P-frames from old WMV3 variant until their format is figured
kostya
parents: 3528
diff changeset
866 // 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
867 // "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
868 av_log(avctx, AV_LOG_ERROR,
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
869 "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
870 //return -1;
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
871 }
4742
184d33cce3b6 FASTTX==0 means additional 16 bits in extradata
kostya
parents: 4741
diff changeset
872 //TODO: figure out what they mean (always 0x402F)
184d33cce3b6 FASTTX==0 means additional 16 bits in extradata
kostya
parents: 4741
diff changeset
873 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
874 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
875 "Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n"
3457
ad66c11aeab4 FastUVMV vs FastUVMC typo, noticed by bond
diego
parents: 3453
diff changeset
876 "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
877 "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
878 "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
879 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
880 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
881 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
882 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
883 );
3691
ff18ceefe3d8 [Cosmetics] Remove if(profile < PROFILE_ADVANCED) from decode_sequence_header()
kostya
parents: 3690
diff changeset
884 return 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
885 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
886
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
887 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
888 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
889 v->res_rtm_flag = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
890 v->level = get_bits(gb, 3);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
891 if(v->level >= 5)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
892 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
893 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
894 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
895 v->chromaformat = get_bits(gb, 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
896 if (v->chromaformat != 1)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
897 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
898 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
899 "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
900 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
901 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
902
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
903 // (fps-2)/4 (->30)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
904 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
905 // (bitrate-32kbps)/64kbps
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
906 v->bitrtq_postproc = get_bits(gb, 5); //common
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
907 v->postprocflag = get_bits1(gb); //common
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
908
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
909 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
910 v->s.avctx->coded_height = (get_bits(gb, 12) + 1) << 1;
4474
82277cf5f051 Set codec dimensions in extradata parsing
kostya
parents: 4471
diff changeset
911 v->s.avctx->width = v->s.avctx->coded_width;
82277cf5f051 Set codec dimensions in extradata parsing
kostya
parents: 4471
diff changeset
912 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
913 v->broadcast = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
914 v->interlace = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
915 v->tfcntrflag = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
916 v->finterpflag = get_bits1(gb);
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
917 skip_bits1(gb); // reserved
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
918
4680
71c1e1171e83 Proper handling of motion vectors for adv. profile
kostya
parents: 4605
diff changeset
919 v->s.h_edge_pos = v->s.avctx->coded_width;
71c1e1171e83 Proper handling of motion vectors for adv. profile
kostya
parents: 4605
diff changeset
920 v->s.v_edge_pos = v->s.avctx->coded_height;
71c1e1171e83 Proper handling of motion vectors for adv. profile
kostya
parents: 4605
diff changeset
921
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
922 av_log(v->s.avctx, AV_LOG_DEBUG,
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
923 "Advanced Profile level %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
924 "LoopFilter=%i, ChromaFormat=%i, Pulldown=%i, Interlace: %i\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
925 "TFCTRflag=%i, FINTERPflag=%i\n",
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
926 v->level, v->frmrtq_postproc, v->bitrtq_postproc,
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
927 v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace,
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
928 v->tfcntrflag, v->finterpflag
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
929 );
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
930
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
931 v->psf = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
932 if(v->psf) { //PsF, 6.1.13
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
933 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
934 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
935 }
4486
1d2320afa864 B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents: 4485
diff changeset
936 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
937 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
938 int w, h, ar = 0;
4467
a9f64d2a2e69 These messages are just for debug purposes
kostya
parents: 4466
diff changeset
939 av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n");
4466
1dea76bf254f Set codec dimensions if provided by extradata
kostya
parents: 4465
diff changeset
940 v->s.avctx->width = v->s.width = w = get_bits(gb, 14) + 1;
1dea76bf254f Set codec dimensions if provided by extradata
kostya
parents: 4465
diff changeset
941 v->s.avctx->height = v->s.height = h = get_bits(gb, 14) + 1;
4467
a9f64d2a2e69 These messages are just for debug purposes
kostya
parents: 4466
diff changeset
942 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
943 if(get_bits1(gb))
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
944 ar = get_bits(gb, 4);
4414
7c42c51b1130 Set aspect ratio if present (for AP only)
kostya
parents: 4402
diff changeset
945 if(ar && ar < 14){
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
946 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
947 }else if(ar == 15){
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
948 w = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
949 h = get_bits(gb, 8);
4414
7c42c51b1130 Set aspect ratio if present (for AP only)
kostya
parents: 4402
diff changeset
950 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
951 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
952
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
953 if(get_bits1(gb)){ //framerate stuff
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
954 if(get_bits1(gb)) {
4470
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
955 v->s.avctx->time_base.num = 32;
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
956 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
957 } else {
4470
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
958 int nr, dr;
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
959 nr = get_bits(gb, 8);
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
960 dr = get_bits(gb, 4);
2c9a66c5223a Set frame rate from extradata
kostya
parents: 4467
diff changeset
961 if(nr && nr < 8 && dr && dr < 3){
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
962 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
963 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
964 }
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
965 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
966 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
967
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
968 if(get_bits1(gb)){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
969 v->color_prim = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
970 v->transfer_char = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
971 v->matrix_coef = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
972 }
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
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
975 v->hrd_param_flag = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
976 if(v->hrd_param_flag) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
977 int i;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
978 v->hrd_num_leaky_buckets = get_bits(gb, 5);
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
979 skip_bits(gb, 4); //bitrate exponent
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
980 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
981 for(i = 0; i < v->hrd_num_leaky_buckets; i++) {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
982 skip_bits(gb, 16); //hrd_rate[n]
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
983 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
984 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
985 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
986 return 0;
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
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
989 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
990 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
991 VC1Context *v = avctx->priv_data;
4486
1d2320afa864 B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents: 4485
diff changeset
992 int i, blink, clentry, refdist;
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 av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32));
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
995 blink = get_bits1(gb); // broken link
4486
1d2320afa864 B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents: 4485
diff changeset
996 clentry = get_bits1(gb); // closed entry
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
997 v->panscanflag = get_bits1(gb);
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
998 refdist = get_bits1(gb); // refdist flag
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
999 v->s.loop_filter = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1000 v->fastuvmc = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1001 v->extended_mv = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1002 v->dquant = get_bits(gb, 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1003 v->vstransform = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1004 v->overlap = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1005 v->quantizer_mode = get_bits(gb, 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1006
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1007 if(v->hrd_param_flag){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1008 for(i = 0; i < v->hrd_num_leaky_buckets; i++) {
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1009 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
1010 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1011 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1012
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1013 if(get_bits1(gb)){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1014 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
1015 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
1016 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1017 if(v->extended_mv)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1018 v->extended_dmv = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1019 if(get_bits1(gb)) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1020 av_log(avctx, AV_LOG_ERROR, "Luma scaling is not supported, expect wrong picture\n");
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1021 skip_bits(gb, 3); // Y range, ignored for now
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1022 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1023 if(get_bits1(gb)) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1024 av_log(avctx, AV_LOG_ERROR, "Chroma scaling is not supported, expect wrong picture\n");
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1025 skip_bits(gb, 3); // UV range, ignored for now
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1026 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1027
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1028 av_log(avctx, AV_LOG_DEBUG, "Entry point info:\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1029 "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1030 "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n"
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1031 "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n",
4486
1d2320afa864 B-frames could not be determined from broken_link/closed_entry, use fixed value
kostya
parents: 4485
diff changeset
1032 blink, clentry, v->panscanflag, refdist, v->s.loop_filter,
4402
43f4d0d7672c Add debug messages for AP headers
kostya
parents: 4401
diff changeset
1033 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
1034
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1035 return 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1036 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1037
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1038 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
1039 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1040 int pqindex, lowquant, status;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1041
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1042 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
1043 skip_bits(gb, 2); //framecnt unused
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1044 v->rangeredfrm = 0;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1045 if (v->rangered) v->rangeredfrm = get_bits1(gb);
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1046 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
1047 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
1048 if (!v->s.pict_type) {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1049 if (get_bits1(gb)) v->s.pict_type = I_TYPE;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1050 else v->s.pict_type = B_TYPE;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1051 } else v->s.pict_type = P_TYPE;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1052 } else v->s.pict_type = v->s.pict_type ? P_TYPE : I_TYPE;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1053
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1054 v->bi_type = 0;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1055 if(v->s.pict_type == B_TYPE) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1056 v->bfraction = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1057 v->bfraction = ff_vc1_bfraction_lut[v->bfraction];
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1058 if(v->bfraction == 0) {
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1059 v->s.pict_type = BI_TYPE;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1060 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1061 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1062 if(v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE)
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1063 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
1064
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1065 /* calculate RND */
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1066 if(v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE)
3474
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1067 v->rnd = 1;
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1068 if(v->s.pict_type == P_TYPE)
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1069 v->rnd ^= 1;
24f293c3f3ef Rounding control for motion compensation.
kostya
parents: 3457
diff changeset
1070
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1071 /* Quantizer stuff */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1072 pqindex = get_bits(gb, 5);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1073 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1074 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
1075 else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1076 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
1077
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
1078 v->pquantizer = 1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1079 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
1080 v->pquantizer = pqindex < 9;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
1081 if (v->quantizer_mode == QUANT_NON_UNIFORM)
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
1082 v->pquantizer = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1083 v->pqindex = pqindex;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1084 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
1085 else v->halfpq = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1086 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1087 v->pquantizer = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1088 v->dquantfrm = 0;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1089 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
1090 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
1091 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
1092 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
1093 v->range_y = 1 << (v->k_y - 1);
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1094 if (v->profile == PROFILE_ADVANCED)
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1095 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1096 if (v->postprocflag) v->postproc = get_bits1(gb);
3452
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1097 }
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1098 else
f024ca7c768b MVRANGE may occur in all frames and RESPIC in all but B-frames
kostya
parents: 3451
diff changeset
1099 if (v->multires && v->s.pict_type != B_TYPE) v->respic = get_bits(gb, 2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1100
4604
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
1101 if(v->res_x8 && (v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE)){
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
1102 if(get_bits1(gb))return -1;
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
1103 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1104 //av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n",
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1105 // (v->s.pict_type == P_TYPE) ? 'P' : ((v->s.pict_type == I_TYPE) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1106
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1107 if(v->s.pict_type == I_TYPE || v->s.pict_type == P_TYPE) v->use_ic = 0;
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1108
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1109 switch(v->s.pict_type) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1110 case P_TYPE:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1111 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
1112 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
1113 else v->tt_index = 2;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1114
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1115 lowquant = (v->pq > 12) ? 0 : 1;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1116 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
1117 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
1118 {
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1119 int scale, shift, i;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1120 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
1121 v->lumscale = get_bits(gb, 6);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1122 v->lumshift = get_bits(gb, 6);
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1123 v->use_ic = 1;
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1124 /* fill lookup tables for intensity compensation */
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1125 if(!v->lumscale) {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1126 scale = -64;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1127 shift = (255 - v->lumshift * 2) << 6;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1128 if(v->lumshift > 31)
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1129 shift += 128 << 6;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1130 } else {
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1131 scale = v->lumscale + 32;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1132 if(v->lumshift > 31)
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1133 shift = (v->lumshift - 64) << 6;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1134 else
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1135 shift = v->lumshift << 6;
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1136 }
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1137 for(i = 0; i < 256; i++) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4518
diff changeset
1138 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4518
diff changeset
1139 v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6);
3406
75ab0c53742a Implement intensity compensation
kostya
parents: 3405
diff changeset
1140 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1141 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1142 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
1143 v->s.quarter_sample = 0;
3401
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1144 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1145 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
1146 v->s.quarter_sample = 0;
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1147 else
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1148 v->s.quarter_sample = 1;
e88c3bc82b15 Correctly detect when use hpel or qpel mode
kostya
parents: 3400
diff changeset
1149 } else
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1150 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
1151 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
1152
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1153 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
1154 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
1155 || 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
1156 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1157 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
1158 if (status < 0) return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1159 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
1160 "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
1161 } else {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1162 v->mv_type_is_raw = 0;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1163 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
1164 }
3375
a1c2e1603be9 Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents: 3371
diff changeset
1165 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
1166 if (status < 0) return -1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1167 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
1168 "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
1169
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1170 /* Hopefully this is correct for P frames */
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1171 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
1172 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
1173
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1174 if (v->dquant)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1175 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1176 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
1177 vop_dquant_decoding(v);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1178 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1179
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1180 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
1181 if (v->vstransform)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1182 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1183 v->ttmbf = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1184 if (v->ttmbf)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1185 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1186 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
1187 }
3506
e0996476198b Set correctly quantizer and transform mode when parsing frame header.
kostya
parents: 3476
diff changeset
1188 } else {
e0996476198b Set correctly quantizer and transform mode when parsing frame header.
kostya
parents: 3476
diff changeset
1189 v->ttmbf = 1;
e0996476198b Set correctly quantizer and transform mode when parsing frame header.
kostya
parents: 3476
diff changeset
1190 v->ttfrm = TT_8X8;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1191 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1192 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1193 case B_TYPE:
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1194 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
1195 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
1196 else v->tt_index = 2;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1197
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1198 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
1199 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
1200 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
1201 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
1202
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1203 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
1204 if (status < 0) return -1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1205 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
1206 "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
1207 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
1208 if (status < 0) return -1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1209 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
1210 "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
1211
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1212 v->s.mv_table_index = get_bits(gb, 2);
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1213 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
1214
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1215 if (v->dquant)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1216 {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1217 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
1218 vop_dquant_decoding(v);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1219 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1220
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1221 v->ttfrm = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1222 if (v->vstransform)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1223 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1224 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
1225 if (v->ttmbf)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1226 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1227 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
1228 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1229 } else {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1230 v->ttmbf = 1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1231 v->ttfrm = TT_8X8;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1232 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1233 break;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1234 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1235
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1236 /* AC Syntax */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1237 v->c_ac_table_index = decode012(gb);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1238 if (v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1239 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1240 v->y_ac_table_index = decode012(gb);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1241 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1242 /* DC Syntax */
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1243 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
1244
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1245 if(v->s.pict_type == BI_TYPE) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1246 v->s.pict_type = B_TYPE;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1247 v->bi_type = 1;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1248 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1249 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1250 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1251
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1252 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
1253 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1254 int pqindex, lowquant;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1255 int status;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1256
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1257 v->p_frame_skipped = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1258
4487
0a0a9f0c9c2d Progressive frames disguised as interlaced are supported
kostya
parents: 4486
diff changeset
1259 if(v->interlace){
4471
cfbd1f3d457c Save frame header info in context variables
kostya
parents: 4470
diff changeset
1260 v->fcm = decode012(gb);
4487
0a0a9f0c9c2d Progressive frames disguised as interlaced are supported
kostya
parents: 4486
diff changeset
1261 if(v->fcm) return -1; // interlaced frames/fields are not implemented
0a0a9f0c9c2d Progressive frames disguised as interlaced are supported
kostya
parents: 4486
diff changeset
1262 }
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1263 switch(get_unary(gb, 0, 4)) {
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1264 case 0:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1265 v->s.pict_type = P_TYPE;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1266 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1267 case 1:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1268 v->s.pict_type = B_TYPE;
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1269 break;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1270 case 2:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1271 v->s.pict_type = I_TYPE;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1272 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1273 case 3:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1274 v->s.pict_type = BI_TYPE;
3693
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1275 break;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1276 case 4:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1277 v->s.pict_type = P_TYPE; // skipped pic
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1278 v->p_frame_skipped = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1279 return 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1280 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1281 if(v->tfcntrflag)
5519
b790f8c0ee24 use skip_bits where appropriate
alex
parents: 5513
diff changeset
1282 skip_bits(gb, 8);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1283 if(v->broadcast) {
4485
81a120f5f8d0 Wrong flag tested
kostya
parents: 4474
diff changeset
1284 if(!v->interlace || v->psf) {
4471
cfbd1f3d457c Save frame header info in context variables
kostya
parents: 4470
diff changeset
1285 v->rptfrm = get_bits(gb, 2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1286 } else {
4471
cfbd1f3d457c Save frame header info in context variables
kostya
parents: 4470
diff changeset
1287 v->tff = get_bits1(gb);
cfbd1f3d457c Save frame header info in context variables
kostya
parents: 4470
diff changeset
1288 v->rptfrm = get_bits1(gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1289 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1290 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1291 if(v->panscanflag) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1292 //...
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1293 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1294 v->rnd = get_bits1(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1295 if(v->interlace)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1296 v->uvsamp = get_bits1(gb);
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1297 if(v->finterpflag) v->interpfrm = get_bits1(gb);
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1298 if(v->s.pict_type == B_TYPE) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1299 v->bfraction = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1300 v->bfraction = ff_vc1_bfraction_lut[v->bfraction];
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1301 if(v->bfraction == 0) {
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1302 v->s.pict_type = BI_TYPE; /* XXX: should not happen here */
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1303 }
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1304 }
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1305 pqindex = get_bits(gb, 5);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1306 v->pqindex = pqindex;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1307 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1308 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
1309 else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1310 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
1311
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1312 v->pquantizer = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1313 if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1314 v->pquantizer = pqindex < 9;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1315 if (v->quantizer_mode == QUANT_NON_UNIFORM)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1316 v->pquantizer = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1317 v->pqindex = pqindex;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1318 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
1319 else v->halfpq = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1320 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1321 v->pquantizer = get_bits1(gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1322
4518
e3c43b4aa9ac Intensity compensation for B-frames in AP was missing
kostya
parents: 4487
diff changeset
1323 if(v->s.pict_type == I_TYPE || v->s.pict_type == P_TYPE) v->use_ic = 0;
e3c43b4aa9ac Intensity compensation for B-frames in AP was missing
kostya
parents: 4487
diff changeset
1324
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1325 switch(v->s.pict_type) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1326 case I_TYPE:
3693
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1327 case BI_TYPE:
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1328 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
1329 if (status < 0) return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1330 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
1331 "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
1332 v->condover = CONDOVER_NONE;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1333 if(v->overlap && v->pq <= 8) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1334 v->condover = decode012(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1335 if(v->condover == CONDOVER_SELECT) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1336 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
1337 if (status < 0) return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1338 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
1339 "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
1340 }
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 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1343 case P_TYPE:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1344 if(v->postprocflag)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1345 v->postproc = get_bits1(gb);
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1346 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
1347 else v->mvrange = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1348 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
1349 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
1350 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
1351 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
1352
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1353 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
1354 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
1355 else v->tt_index = 2;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1356
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1357 lowquant = (v->pq > 12) ? 0 : 1;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1358 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
1359 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
1360 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1361 int scale, shift, i;
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1362 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
1363 v->lumscale = get_bits(gb, 6);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1364 v->lumshift = get_bits(gb, 6);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1365 /* fill lookup tables for intensity compensation */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1366 if(!v->lumscale) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1367 scale = -64;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1368 shift = (255 - v->lumshift * 2) << 6;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1369 if(v->lumshift > 31)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1370 shift += 128 << 6;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1371 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1372 scale = v->lumscale + 32;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1373 if(v->lumshift > 31)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1374 shift = (v->lumshift - 64) << 6;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1375 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1376 shift = v->lumshift << 6;
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 for(i = 0; i < 256; i++) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4518
diff changeset
1379 v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6);
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4518
diff changeset
1380 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
1381 }
4518
e3c43b4aa9ac Intensity compensation for B-frames in AP was missing
kostya
parents: 4487
diff changeset
1382 v->use_ic = 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1383 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1384 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
1385 v->s.quarter_sample = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1386 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
1387 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
1388 v->s.quarter_sample = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1389 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1390 v->s.quarter_sample = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1391 } else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1392 v->s.quarter_sample = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1393 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
1394
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1395 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
1396 v->mv_mode2 == MV_PMODE_MIXED_MV)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1397 || v->mv_mode == MV_PMODE_MIXED_MV)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1398 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1399 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
1400 if (status < 0) return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1401 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
1402 "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
1403 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1404 v->mv_type_is_raw = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1405 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
1406 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1407 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
1408 if (status < 0) return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1409 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
1410 "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
1411
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1412 /* Hopefully this is correct for P frames */
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1413 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
1414 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
1415 if (v->dquant)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1416 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1417 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
1418 vop_dquant_decoding(v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1419 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1420
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1421 v->ttfrm = 0; //FIXME Is that so ?
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1422 if (v->vstransform)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1423 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1424 v->ttmbf = get_bits1(gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1425 if (v->ttmbf)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1426 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1427 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
1428 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1429 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1430 v->ttmbf = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1431 v->ttfrm = TT_8X8;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1432 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1433 break;
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1434 case B_TYPE:
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1435 if(v->postprocflag)
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1436 v->postproc = get_bits1(gb);
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
1437 if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3);
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1438 else v->mvrange = 0;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1439 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
1440 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
1441 v->range_x = 1 << (v->k_x - 1);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1442 v->range_y = 1 << (v->k_y - 1);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1443
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1444 if (v->pq < 5) v->tt_index = 0;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1445 else if(v->pq < 13) v->tt_index = 1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1446 else v->tt_index = 2;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1447
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1448 lowquant = (v->pq > 12) ? 0 : 1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1449 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
1450 v->s.quarter_sample = (v->mv_mode == MV_PMODE_1MV);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1451 v->s.mspel = v->s.quarter_sample;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1452
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1453 status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1454 if (status < 0) return -1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1455 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
1456 "Imode: %i, Invert: %i\n", status>>1, status&1);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1457 status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1458 if (status < 0) return -1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1459 av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1460 "Imode: %i, Invert: %i\n", status>>1, status&1);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1461
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1462 v->s.mv_table_index = get_bits(gb, 2);
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1463 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
1464
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1465 if (v->dquant)
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1466 {
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1467 av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1468 vop_dquant_decoding(v);
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1469 }
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1470
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1471 v->ttfrm = 0;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1472 if (v->vstransform)
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1473 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1474 v->ttmbf = get_bits1(gb);
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1475 if (v->ttmbf)
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1476 {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1477 v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
4238
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1478 }
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1479 } else {
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1480 v->ttmbf = 1;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1481 v->ttfrm = TT_8X8;
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1482 }
a784639411d6 B-frames support for adv. profile
kostya
parents: 4237
diff changeset
1483 break;
3672
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
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1486 /* AC Syntax */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1487 v->c_ac_table_index = decode012(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1488 if (v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1489 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1490 v->y_ac_table_index = decode012(gb);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1491 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1492 /* DC Syntax */
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1493 v->s.dc_table_index = get_bits1(gb);
4433
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
1494 if ((v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE) && v->dquant) {
3672
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, "VOP DQuant info\n");
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1496 vop_dquant_decoding(v);
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
3693
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1499 v->bi_type = 0;
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1500 if(v->s.pict_type == BI_TYPE) {
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1501 v->s.pict_type = B_TYPE;
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1502 v->bi_type = 1;
e9be5d4bad80 Support for BI-frames in Advanced Profile
kostya
parents: 3692
diff changeset
1503 }
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
1504 return 0;
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
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1507 /***********************************************************************/
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1508 /**
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1509 * @defgroup block VC-1 Block-level functions
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1510 * @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
1511 * @{
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1512 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1513
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1514 /**
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1515 * @def GET_MQUANT
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1516 * @brief Get macroblock-level quantizer scale
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1517 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1518 #define GET_MQUANT() \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1519 if (v->dquantfrm) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1520 { \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1521 int edges = 0; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1522 if (v->dqprofile == DQPROFILE_ALL_MBS) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1523 { \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1524 if (v->dqbilevel) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1525 { \
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
1526 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
1527 } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1528 else \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1529 { \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1530 mqdiff = get_bits(gb, 3); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1531 if (mqdiff != 7) mquant = v->pq + mqdiff; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1532 else mquant = get_bits(gb, 5); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1533 } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1534 } \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1535 if(v->dqprofile == DQPROFILE_SINGLE_EDGE) \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1536 edges = 1 << v->dqsbedge; \
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1537 else if(v->dqprofile == DQPROFILE_DOUBLE_EDGES) \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1538 edges = (3 << v->dqsbedge) % 15; \
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1539 else if(v->dqprofile == DQPROFILE_FOUR_EDGES) \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1540 edges = 15; \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1541 if((edges&1) && !s->mb_x) \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1542 mquant = v->altpq; \
3451
45724ba8d666 Fix mquant selection for ALL_MBS mode
kostya
parents: 3450
diff changeset
1543 if((edges&2) && s->first_slice_line) \
3404
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1544 mquant = v->altpq; \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1545 if((edges&4) && s->mb_x == (s->mb_width - 1)) \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1546 mquant = v->altpq; \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1547 if((edges&8) && s->mb_y == (s->mb_height - 1)) \
0f56ae23d338 Optimizations suggested by Michael Niedermayer
kostya
parents: 3401
diff changeset
1548 mquant = v->altpq; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1549 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1550
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1551 /**
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1552 * @def GET_MVDATA(_dmv_x, _dmv_y)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1553 * @brief Get MV differentials
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1554 * @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
1555 * @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
1556 * @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
1557 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1558 #define GET_MVDATA(_dmv_x, _dmv_y) \
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
1559 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
1560 VC1_MV_DIFF_VLC_BITS, 2); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1561 if (index > 36) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1562 { \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1563 mb_has_coeffs = 1; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1564 index -= 37; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1565 } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1566 else mb_has_coeffs = 0; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1567 s->mb_intra = 0; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1568 if (!index) { _dmv_x = _dmv_y = 0; } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1569 else if (index == 35) \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1570 { \
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1571 _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
1572 _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
1573 } \
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1574 else if (index == 36) \
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1575 { \
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1576 _dmv_x = 0; \
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1577 _dmv_y = 0; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1578 s->mb_intra = 1; \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1579 } \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1580 else \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1581 { \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1582 index1 = index%6; \
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1583 if (!s->quarter_sample && index1 == 5) val = 1; \
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1584 else val = 0; \
3366
c59aa4cdf042 This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents: 3364
diff changeset
1585 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
1586 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
1587 else val = 0; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1588 sign = 0 - (val&1); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1589 _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
1590 \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1591 index1 = index/6; \
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1592 if (!s->quarter_sample && index1 == 5) val = 1; \
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1593 else val = 0; \
3366
c59aa4cdf042 This should make P-frames decoding work on x86 (by avoiding get_bits(0))
kostya
parents: 3364
diff changeset
1594 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
1595 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
1596 else val = 0; \
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1597 sign = 0 - (val&1); \
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1598 _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
1599 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
1600
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1601 /** Predict and set motion vector
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1602 */
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1603 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
1604 {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1605 int xy, wrap, off = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1606 int16_t *A, *B, *C;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1607 int px, py;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1608 int sum;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1609
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1610 /* scale MV difference to be quad-pel */
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1611 dmv_x <<= 1 - s->quarter_sample;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
1612 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
1613
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1614 wrap = s->b8_stride;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1615 xy = s->block_index[n];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1616
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1617 if(s->mb_intra){
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1618 s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1619 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
1620 s->current_picture.motion_val[1][xy][0] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1621 s->current_picture.motion_val[1][xy][1] = 0;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1622 if(mv1) { /* duplicate motion data for 1-MV block */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1623 s->current_picture.motion_val[0][xy + 1][0] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1624 s->current_picture.motion_val[0][xy + 1][1] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1625 s->current_picture.motion_val[0][xy + wrap][0] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1626 s->current_picture.motion_val[0][xy + wrap][1] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1627 s->current_picture.motion_val[0][xy + wrap + 1][0] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1628 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
1629 s->current_picture.motion_val[1][xy + 1][0] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1630 s->current_picture.motion_val[1][xy + 1][1] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1631 s->current_picture.motion_val[1][xy + wrap][0] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1632 s->current_picture.motion_val[1][xy + wrap][1] = 0;
b4dd7005d807 Zero MV vectors for P frame intra blocks
kostya
parents: 4681
diff changeset
1633 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
1634 s->current_picture.motion_val[1][xy + wrap + 1][1] = 0;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1635 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1636 return;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1637 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1638
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1639 C = s->current_picture.motion_val[0][xy - 1];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1640 A = s->current_picture.motion_val[0][xy - wrap];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1641 if(mv1)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1642 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 2;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1643 else {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1644 //in 4-MV mode different blocks have different B predictor position
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1645 switch(n){
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1646 case 0:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1647 off = (s->mb_x > 0) ? -1 : 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1648 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1649 case 1:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1650 off = (s->mb_x == (s->mb_width - 1)) ? -1 : 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1651 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1652 case 2:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1653 off = 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1654 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1655 case 3:
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1656 off = -1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1657 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1658 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1659 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
1660
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1661 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
1662 if(s->mb_width == 1) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1663 px = A[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1664 py = A[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1665 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1666 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
1667 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
1668 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1669 } 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
1670 px = C[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1671 py = C[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1672 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1673 px = py = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1674 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1675 /* 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
1676 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1677 int qx, qy, X, Y;
3400
84de54d536bd 4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents: 3399
diff changeset
1678 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
1679 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
1680 X = (s->mb_width << 6) - 4;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1681 Y = (s->mb_height << 6) - 4;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1682 if(mv1) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1683 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
1684 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
1685 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1686 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
1687 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
1688 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1689 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
1690 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
1691 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1692 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1693 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
1694 if(is_intra[xy - wrap])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1695 sum = FFABS(px) + FFABS(py);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1696 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1697 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
1698 if(sum > 32) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1699 if(get_bits1(&s->gb)) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1700 px = A[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1701 py = A[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1702 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1703 px = C[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1704 py = C[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1705 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1706 } else {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1707 if(is_intra[xy - 1])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1708 sum = FFABS(px) + FFABS(py);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1709 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1710 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
1711 if(sum > 32) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1712 if(get_bits1(&s->gb)) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1713 px = A[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1714 py = A[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1715 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1716 px = C[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1717 py = C[1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1718 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1719 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1720 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1721 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1722 /* store MV using signed modulus of MV range defined in 4.11 */
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1723 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
1724 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
1725 if(mv1) { /* duplicate motion data for 1-MV block */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
1726 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
1727 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
1728 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
1729 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
1730 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
1731 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
1732 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1733 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
1734
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1735 /** 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
1736 */
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1737 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
1738 {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1739 MpegEncContext *s = &v->s;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1740 DSPContext *dsp = &v->s.dsp;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1741 uint8_t *srcY, *srcU, *srcV;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1742 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
1743
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1744 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
1745
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1746 mx = s->mv[1][0][0];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1747 my = s->mv[1][0][1];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1748 uvmx = (mx + ((mx & 3) == 3)) >> 1;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1749 uvmy = (my + ((my & 3) == 3)) >> 1;
4258
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
1750 if(v->fastuvmc) {
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
1751 uvmx = uvmx + ((uvmx<0)?-(uvmx&1):(uvmx&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
1752 uvmy = uvmy + ((uvmy<0)?-(uvmy&1):(uvmy&1));
4d2f162506e3 10e6l FastUVMC was done right but in the wrong place
kostya
parents: 4247
diff changeset
1753 }
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1754 srcY = s->next_picture.data[0];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1755 srcU = s->next_picture.data[1];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1756 srcV = s->next_picture.data[2];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1757
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1758 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
1759 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
1760 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
1761 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
1762
4681
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1763 if(v->profile != PROFILE_ADVANCED){
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1764 src_x = av_clip( src_x, -16, s->mb_width * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1765 src_y = av_clip( src_y, -16, s->mb_height * 16);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1766 uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1767 uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1768 }else{
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1769 src_x = av_clip( src_x, -17, s->avctx->coded_width);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1770 src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1771 uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1772 uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
b82cff2e2e83 indentation
kostya
parents: 4680
diff changeset
1773 }
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1774
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1775 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
1776 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
1777 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
1778
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1779 /* 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
1780 if(s->flags & CODEC_FLAG_GRAY) {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1781 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
1782 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
1783 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1784
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1785 if(v->rangeredfrm
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1786 || (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
1787 || (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
1788 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
1789
3708
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1790 srcY -= s->mspel * (1 + s->linesize);
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1791 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
1792 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
1793 srcY = s->edge_emu_buffer;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1794 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
1795 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
1796 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
1797 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
1798 srcU = uvbuf;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1799 srcV = uvbuf + 16;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1800 /* 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
1801 if(v->rangeredfrm) {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1802 int i, j;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1803 uint8_t *src, *src2;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1804
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1805 src = srcY;
3708
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1806 for(j = 0; j < 17 + s->mspel*2; j++) {
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1807 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
1808 src += s->linesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1809 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1810 src = srcU; src2 = srcV;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1811 for(j = 0; j < 9; j++) {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1812 for(i = 0; i < 9; i++) {
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1813 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
1814 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
1815 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1816 src += s->uvlinesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1817 src2 += s->uvlinesize;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1818 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1819 }
3708
a8d2bd2e1928 Fix edge emulation for bicubic MC in B frames
kostya
parents: 3707
diff changeset
1820 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
1821 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1822
3654
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1823 mx >>= 1;
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1824 my >>= 1;
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1825 dxy = ((my & 1) << 1) | (mx & 1);
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1826
565d9ddd8eb3 Motion compensation for luma always use halfpel precision.
kostya
parents: 3573
diff changeset
1827 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
1828
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1829 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
1830 /* Chroma MC always uses qpel blilinear */
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1831 uvdxy = ((uvmy & 3) << 2) | (uvmx & 3);
3709
44f5de5a7d03 Use h264_chroma funcs in B-frames MC too
kostya
parents: 3708
diff changeset
1832 uvmx = (uvmx&3)<<1;
44f5de5a7d03 Use h264_chroma funcs in B-frames MC too
kostya
parents: 3708
diff changeset
1833 uvmy = (uvmy&3)<<1;
44f5de5a7d03 Use h264_chroma funcs in B-frames MC too
kostya
parents: 3708
diff changeset
1834 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
1835 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
1836 }
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1837
4283
d6f83e2f8804 rename always_inline to av_always_inline and move to common.h
mru
parents: 4258
diff changeset
1838 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
1839 {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1840 int n = bfrac;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1841
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1842 #if B_FRACTION_DEN==256
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1843 if(inv)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1844 n -= 256;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1845 if(!qs)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1846 return 2 * ((value * n + 255) >> 9);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1847 return (value * n + 128) >> 8;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1848 #else
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1849 if(inv)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1850 n -= B_FRACTION_DEN;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1851 if(!qs)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1852 return 2 * ((value * n + B_FRACTION_DEN - 1) / (2 * B_FRACTION_DEN));
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1853 return (value * n + B_FRACTION_DEN/2) / B_FRACTION_DEN;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1854 #endif
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1855 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1856
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1857 /** 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
1858 */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1859 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
1860 {
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1861 if(v->use_ic) {
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1862 v->mv_mode2 = v->mv_mode;
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1863 v->mv_mode = MV_PMODE_INTENSITY_COMP;
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1864 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1865 if(direct) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1866 vc1_mc_1mv(v, 0);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1867 vc1_interp_mc(v);
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1868 if(v->use_ic) v->mv_mode = v->mv_mode2;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1869 return;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1870 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1871 if(mode == BMV_TYPE_INTERPOLATED) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1872 vc1_mc_1mv(v, 0);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1873 vc1_interp_mc(v);
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1874 if(v->use_ic) v->mv_mode = v->mv_mode2;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1875 return;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1876 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1877
3744
805aee1f7cce For B-frames if the second reference frame signals intensity compensation
kostya
parents: 3743
diff changeset
1878 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
1879 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
1880 if(v->use_ic) v->mv_mode = v->mv_mode2;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1881 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1882
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1883 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
1884 {
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
1885 MpegEncContext *s = &v->s;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1886 int xy, wrap, off = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1887 int16_t *A, *B, *C;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1888 int px, py;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1889 int sum;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1890 int r_x, r_y;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1891 const uint8_t *is_intra = v->mb_type[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1892
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1893 r_x = v->range_x;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1894 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
1895 /* 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
1896 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
1897 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
1898 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
1899 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
1900
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1901 wrap = s->b8_stride;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1902 xy = s->block_index[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1903
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1904 if(s->mb_intra) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1905 s->current_picture.motion_val[0][xy][0] =
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1906 s->current_picture.motion_val[0][xy][1] =
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1907 s->current_picture.motion_val[1][xy][0] =
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1908 s->current_picture.motion_val[1][xy][1] = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1909 return;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1910 }
3743
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
1911 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
1912 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
1913 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
1914 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
1915
bc40c297ea15 Pullback should be performed on scaled motion vectors in B-frames
kostya
parents: 4834
diff changeset
1916 /* 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
1917 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
1918 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
1919 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
1920 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
1921 if(direct) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1922 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
1923 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
1924 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
1925 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
1926 return;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
1927 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1928
3743
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
1929 if((mvtype == BMV_TYPE_FORWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1930 C = s->current_picture.motion_val[0][xy - 2];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1931 A = s->current_picture.motion_val[0][xy - wrap*2];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1932 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1933 B = s->current_picture.motion_val[0][xy - wrap*2 + off];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1934
4834
300b60dee58c Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents: 4784
diff changeset
1935 if(!s->mb_x) C[0] = C[1] = 0;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1936 if(!s->first_slice_line) { // predictor A is not out of bounds
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1937 if(s->mb_width == 1) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1938 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1939 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1940 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1941 px = mid_pred(A[0], B[0], C[0]);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1942 py = mid_pred(A[1], B[1], C[1]);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1943 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1944 } else if(s->mb_x) { // predictor C is not out of bounds
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1945 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1946 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1947 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1948 px = py = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1949 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1950 /* Pullback MV as specified in 8.3.5.3.4 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1951 {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1952 int qx, qy, X, Y;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1953 if(v->profile < PROFILE_ADVANCED) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1954 qx = (s->mb_x << 5);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1955 qy = (s->mb_y << 5);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1956 X = (s->mb_width << 5) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1957 Y = (s->mb_height << 5) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1958 if(qx + px < -28) px = -28 - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1959 if(qy + py < -28) py = -28 - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1960 if(qx + px > X) px = X - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1961 if(qy + py > Y) py = Y - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1962 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1963 qx = (s->mb_x << 6);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1964 qy = (s->mb_y << 6);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1965 X = (s->mb_width << 6) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1966 Y = (s->mb_height << 6) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1967 if(qx + px < -60) px = -60 - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1968 if(qy + py < -60) py = -60 - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1969 if(qx + px > X) px = X - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1970 if(qy + py > Y) py = Y - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1971 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1972 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1973 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1974 if(0 && !s->first_slice_line && s->mb_x) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1975 if(is_intra[xy - wrap])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1976 sum = FFABS(px) + FFABS(py);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1977 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1978 sum = FFABS(px - A[0]) + FFABS(py - A[1]);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1979 if(sum > 32) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1980 if(get_bits1(&s->gb)) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1981 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1982 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1983 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1984 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1985 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1986 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1987 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1988 if(is_intra[xy - 2])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1989 sum = FFABS(px) + FFABS(py);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1990 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
1991 sum = FFABS(px - C[0]) + FFABS(py - C[1]);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1992 if(sum > 32) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1993 if(get_bits1(&s->gb)) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1994 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1995 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1996 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1997 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1998 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
1999 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2000 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2001 }
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
2002 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2003 /* store MV using signed modulus of MV range defined in 4.11 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2004 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
2005 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
2006 }
3743
fc613a610303 Reorder MV order in B-frames so no swapping in vc1_b_mc() is needed
kostya
parents: 3711
diff changeset
2007 if((mvtype == BMV_TYPE_BACKWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2008 C = s->current_picture.motion_val[1][xy - 2];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2009 A = s->current_picture.motion_val[1][xy - wrap*2];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2010 off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2011 B = s->current_picture.motion_val[1][xy - wrap*2 + off];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2012
4834
300b60dee58c Set C predictor to zero if unavailable (should fix B-frame border artifacts)
kostya
parents: 4784
diff changeset
2013 if(!s->mb_x) C[0] = C[1] = 0;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2014 if(!s->first_slice_line) { // predictor A is not out of bounds
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2015 if(s->mb_width == 1) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2016 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2017 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2018 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2019 px = mid_pred(A[0], B[0], C[0]);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2020 py = mid_pred(A[1], B[1], C[1]);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2021 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2022 } else if(s->mb_x) { // predictor C is not out of bounds
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2023 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2024 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2025 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2026 px = py = 0;
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 /* Pullback MV as specified in 8.3.5.3.4 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2029 {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2030 int qx, qy, X, Y;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2031 if(v->profile < PROFILE_ADVANCED) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2032 qx = (s->mb_x << 5);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2033 qy = (s->mb_y << 5);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2034 X = (s->mb_width << 5) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2035 Y = (s->mb_height << 5) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2036 if(qx + px < -28) px = -28 - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2037 if(qy + py < -28) py = -28 - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2038 if(qx + px > X) px = X - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2039 if(qy + py > Y) py = Y - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2040 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2041 qx = (s->mb_x << 6);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2042 qy = (s->mb_y << 6);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2043 X = (s->mb_width << 6) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2044 Y = (s->mb_height << 6) - 4;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2045 if(qx + px < -60) px = -60 - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2046 if(qy + py < -60) py = -60 - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2047 if(qx + px > X) px = X - qx;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2048 if(qy + py > Y) py = Y - qy;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2049 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2050 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2051 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2052 if(0 && !s->first_slice_line && s->mb_x) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2053 if(is_intra[xy - wrap])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2054 sum = FFABS(px) + FFABS(py);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2055 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2056 sum = FFABS(px - A[0]) + FFABS(py - A[1]);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2057 if(sum > 32) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2058 if(get_bits1(&s->gb)) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2059 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2060 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2061 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2062 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2063 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2064 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2065 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2066 if(is_intra[xy - 2])
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2067 sum = FFABS(px) + FFABS(py);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2068 else
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
2069 sum = FFABS(px - C[0]) + FFABS(py - C[1]);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2070 if(sum > 32) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2071 if(get_bits1(&s->gb)) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2072 px = A[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2073 py = A[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2074 } else {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2075 px = C[0];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2076 py = C[1];
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2077 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2078 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2079 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2080 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2081 /* store MV using signed modulus of MV range defined in 4.11 */
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2082
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2083 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
2084 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
2085 }
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
2086 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
2087 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
2088 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
2089 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
2090 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
2091
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2092 /** 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
2093 * prediction dir: left=0, top=1
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2094 * @param s MpegEncContext
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2095 * @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
2096 * @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
2097 * @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
2098 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2099 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
2100 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
2101 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2102 int a, b, c, wrap, pred, scale;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2103 int16_t *dc_val;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2104 static const uint16_t dcpred[32] = {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2105 -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
2106 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
2107 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
2108 41, 39, 38, 37, 35, 34, 33
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2109 };
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2110
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2111 /* 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
2112 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
2113 else scale = s->c_dc_scale;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2114
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2115 wrap = s->block_wrap[n];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2116 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
2117
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2118 /* B A
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2119 * C X
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2120 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2121 c = dc_val[ - 1];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2122 b = dc_val[ - 1 - wrap];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2123 a = dc_val[ - wrap];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2124
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2125 if (pq < 9 || !overlap)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2126 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2127 /* Set outer values */
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
2128 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
2129 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
2130 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2131 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2132 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2133 /* Set outer values */
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
2134 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
2135 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
2136 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2137
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2138 if (abs(a - b) <= abs(b - c)) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2139 pred = c;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2140 *dir_ptr = 1;//left
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2141 } else {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2142 pred = a;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2143 *dir_ptr = 0;//top
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2144 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2145
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2146 /* update predictor */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2147 *dc_val_ptr = &dc_val[0];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2148 return pred;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2149 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2150
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2151
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2152 /** Get predicted DC value
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2153 * prediction dir: left=0, top=1
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2154 * @param s MpegEncContext
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2155 * @param[in] n block index in the current MB
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2156 * @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
2157 * @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
2158 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2159 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
2160 int a_avail, int c_avail,
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2161 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
2162 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2163 int a, b, c, wrap, pred, scale;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2164 int16_t *dc_val;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2165 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2166 int q1, q2 = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2167
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2168 /* 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
2169 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
2170 else scale = s->c_dc_scale;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2171
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2172 wrap = s->block_wrap[n];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2173 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
2174
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2175 /* B A
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2176 * C X
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2177 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2178 c = dc_val[ - 1];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2179 b = dc_val[ - 1 - wrap];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2180 a = dc_val[ - wrap];
3508
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2181 /* scale predictors if needed */
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2182 q1 = s->current_picture.qscale_table[mb_pos];
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2183 if(c_avail && (n!= 1 && n!=3)) {
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2184 q2 = s->current_picture.qscale_table[mb_pos - 1];
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2185 if(q2 && q2 != q1)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2186 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
2187 }
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2188 if(a_avail && (n!= 2 && n!=3)) {
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2189 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
2190 if(q2 && q2 != q1)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2191 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
2192 }
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2193 if(a_avail && c_avail && (n!=3)) {
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2194 int off = mb_pos;
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2195 if(n != 1) off--;
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2196 if(n != 2) off -= s->mb_stride;
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2197 q2 = s->current_picture.qscale_table[off];
3d6e4ef3170d 1000l: scale DC predictors instead of predicted value.
kostya
parents: 3507
diff changeset
2198 if(q2 && q2 != q1)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2199 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
2200 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2201
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2202 if(a_avail && c_avail) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2203 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
2204 pred = c;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2205 *dir_ptr = 1;//left
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2206 } else {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2207 pred = a;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2208 *dir_ptr = 0;//top
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2209 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2210 } else if(a_avail) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2211 pred = a;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2212 *dir_ptr = 0;//top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2213 } else if(c_avail) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2214 pred = c;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2215 *dir_ptr = 1;//left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2216 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2217 pred = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2218 *dir_ptr = 1;//left
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2219 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2220
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2221 /* update predictor */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2222 *dc_val_ptr = &dc_val[0];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2223 return pred;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2224 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2225
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2226
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2227 /**
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2228 * @defgroup std_mb VC1 Macroblock-level functions in Simple/Main Profiles
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2229 * @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
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
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2233 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
2234 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2235 int xy, wrap, pred, a, b, c;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2236
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2237 xy = s->block_index[n];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2238 wrap = s->b8_stride;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2239
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2240 /* B C
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2241 * A X
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2242 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2243 a = s->coded_block[xy - 1 ];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2244 b = s->coded_block[xy - 1 - wrap];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2245 c = s->coded_block[xy - wrap];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2246
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2247 if (b == c) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2248 pred = a;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2249 } else {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2250 pred = c;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2251 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2252
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2253 /* store value */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2254 *coded_block_ptr = &s->coded_block[xy];
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2255
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2256 return pred;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2257 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2258
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2259 /**
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2260 * Decode one AC coefficient
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2261 * @param v The VC1 context
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2262 * @param last Last coefficient
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2263 * @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
2264 * @param value Decoded AC coefficient value
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2265 * @see 8.1.3.4
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2266 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2267 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
2268 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2269 GetBitContext *gb = &v->s.gb;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2270 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
2271
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2272 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
2273 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
2274 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
2275 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
2276 lst = index >= vc1_last_decode_table[codingset];
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2277 if(get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2278 level = -level;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2279 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2280 escape = decode210(gb);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2281 if (escape != 2) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2282 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
2283 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
2284 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
2285 lst = index >= vc1_last_decode_table[codingset];
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2286 if(escape == 0) {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2287 if(lst)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2288 level += vc1_last_delta_level_table[codingset][run];
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2289 else
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2290 level += vc1_delta_level_table[codingset][run];
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2291 } else {
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2292 if(lst)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2293 run += vc1_last_delta_run_table[codingset][level] + 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2294 else
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2295 run += vc1_delta_run_table[codingset][level] + 1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2296 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2297 if(get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2298 level = -level;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2299 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2300 int sign;
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2301 lst = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2302 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
2303 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
2304 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
2305 if(!v->s.esc3_level_length)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2306 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
2307 } else { //table 60
5511
7617e066481e use get_unary from bitstream.h
alex
parents: 5299
diff changeset
2308 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
2309 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2310 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
2311 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2312 run = get_bits(gb, v->s.esc3_run_length);
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2313 sign = get_bits1(gb);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2314 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
2315 if(sign)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2316 level = -level;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2317 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2318 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2319
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2320 *last = lst;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2321 *skip = run;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2322 *value = level;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2323 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2324
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2325 /** 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
2326 * @param v VC1Context
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2327 * @param block block to decode
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2328 * @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
2329 * @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
2330 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2331 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
2332 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2333 GetBitContext *gb = &v->s.gb;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2334 MpegEncContext *s = &v->s;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2335 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
2336 int run_diff, i;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2337 int16_t *dc_val;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2338 int16_t *ac_val, *ac_val2;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2339 int dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2340
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2341 /* Get DC differential */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2342 if (n < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2343 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
2344 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2345 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
2346 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2347 if (dcdiff < 0){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2348 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
2349 return -1;
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 if (dcdiff)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2352 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2353 if (dcdiff == 119 /* ESC index value */)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2354 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2355 /* TODO: Optimize */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2356 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
2357 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
2358 else dcdiff = get_bits(gb, 8);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2359 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2360 else
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2361 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2362 if (v->pq == 1)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2363 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
2364 else if (v->pq == 2)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2365 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
2366 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2367 if (get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2368 dcdiff = -dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2369 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2370
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2371 /* Prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2372 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
2373 *dc_val = dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2374
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2375 /* 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
2376 if (n < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2377 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
2378 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2379 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
2380 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2381 /* Skip ? */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2382 run_diff = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2383 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2384 if (!coded) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2385 goto not_coded;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2386 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2387
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2388 //AC Decoding
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2389 i = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2390
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2391 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2392 int last = 0, skip, value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2393 const int8_t *zz_table;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2394 int scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2395 int k;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2396
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2397 scale = v->pq * 2 + v->halfpq;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2398
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2399 if(v->s.ac_pred) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2400 if(!dc_pred_dir)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2401 zz_table = ff_vc1_horizontal_zz;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2402 else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2403 zz_table = ff_vc1_vertical_zz;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2404 } else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2405 zz_table = ff_vc1_normal_zz;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2406
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2407 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
2408 ac_val2 = ac_val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2409 if(dc_pred_dir) //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2410 ac_val -= 16;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2411 else //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2412 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
2413
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2414 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2415 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
2416 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2417 if(i > 63)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2418 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2419 block[zz_table[i++]] = value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2420 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2421
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2422 /* apply AC prediction if needed */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2423 if(s->ac_pred) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2424 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2425 for(k = 1; k < 8; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2426 block[k << 3] += ac_val[k];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2427 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2428 for(k = 1; k < 8; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2429 block[k] += ac_val[k + 8];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2430 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2431 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2432 /* save AC coeffs for further prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2433 for(k = 1; k < 8; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2434 ac_val2[k] = block[k << 3];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2435 ac_val2[k + 8] = block[k];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2436 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2437
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2438 /* scale AC coeffs */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2439 for(k = 1; k < 64; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2440 if(block[k]) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2441 block[k] *= scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2442 if(!v->pquantizer)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2443 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
2444 }
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(s->ac_pred) i = 63;
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
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2449 not_coded:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2450 if(!coded) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2451 int k, scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2452 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
2453 ac_val2 = ac_val;
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 scale = v->pq * 2 + v->halfpq;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2456 memset(ac_val2, 0, 16 * 2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2457 if(dc_pred_dir) {//left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2458 ac_val -= 16;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2459 if(s->ac_pred)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2460 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
2461 } else {//top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2462 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
2463 if(s->ac_pred)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2464 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
2465 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2466
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2467 /* apply AC prediction if needed */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2468 if(s->ac_pred) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2469 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2470 for(k = 1; k < 8; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2471 block[k << 3] = ac_val[k] * scale;
3509
da6095607f26 Don't do non-uniform quantization on zero coeffs.
kostya
parents: 3508
diff changeset
2472 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
2473 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
2474 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2475 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2476 for(k = 1; k < 8; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2477 block[k] = ac_val[k + 8] * scale;
3509
da6095607f26 Don't do non-uniform quantization on zero coeffs.
kostya
parents: 3508
diff changeset
2478 if(!v->pquantizer && block[k])
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2479 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
2480 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2481 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2482 i = 63;
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 s->block_last_index[n] = i;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2486
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2487 return 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2488 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2489
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2490 /** 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
2491 * @param v VC1Context
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2492 * @param block block to decode
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2493 * @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
2494 * @param codingset set of VLC to decode data
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2495 */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2496 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
2497 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2498 GetBitContext *gb = &v->s.gb;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2499 MpegEncContext *s = &v->s;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2500 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
2501 int run_diff, i;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2502 int16_t *dc_val;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2503 int16_t *ac_val, *ac_val2;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2504 int dcdiff;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2505 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
2506 int use_pred = s->ac_pred;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2507 int scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2508 int q1, q2 = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2509 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
2510
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2511 /* Get DC differential */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2512 if (n < 4) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2513 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
2514 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2515 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
2516 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2517 if (dcdiff < 0){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2518 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
2519 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2520 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2521 if (dcdiff)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2522 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2523 if (dcdiff == 119 /* ESC index value */)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2524 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2525 /* TODO: Optimize */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2526 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
2527 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
2528 else dcdiff = get_bits(gb, 8);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2529 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2530 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2531 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2532 if (mquant == 1)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2533 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
2534 else if (mquant == 2)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2535 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
2536 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2537 if (get_bits1(gb))
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2538 dcdiff = -dcdiff;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2539 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2540
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2541 /* Prediction */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2542 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
2543 *dc_val = dcdiff;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2544
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2545 /* 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
2546 if (n < 4) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2547 block[0] = dcdiff * s->y_dc_scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2548 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2549 block[0] = dcdiff * s->c_dc_scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2550 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2551 /* Skip ? */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2552 run_diff = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2553 i = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2554
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2555 //AC Decoding
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2556 i = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2557
5194
d09eaf79979c this prediction direction adjustment is wrong
kostya
parents: 5128
diff changeset
2558 /* 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
2559 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
2560 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
2561 ac_val2 = ac_val;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2562
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2563 scale = mquant * 2 + v->halfpq;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2564
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2565 if(dc_pred_dir) //left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2566 ac_val -= 16;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2567 else //top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2568 ac_val -= 16 * s->block_wrap[n];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2569
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2570 q1 = s->current_picture.qscale_table[mb_pos];
4456
33f181383a21 Check for out-of-bounds access
kostya
parents: 4433
diff changeset
2571 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
2572 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
2573 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
2574 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
2575 if(n==3) q2 = q1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2576
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2577 if(coded) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2578 int last = 0, skip, value;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2579 const int8_t *zz_table;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2580 int k;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2581
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2582 if(v->s.ac_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2583 if(!dc_pred_dir)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2584 zz_table = ff_vc1_horizontal_zz;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2585 else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2586 zz_table = ff_vc1_vertical_zz;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2587 } else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2588 zz_table = ff_vc1_normal_zz;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2589
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2590 while (!last) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2591 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
2592 i += skip;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2593 if(i > 63)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2594 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2595 block[zz_table[i++]] = value;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2596 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2597
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2598 /* apply AC prediction if needed */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2599 if(use_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2600 /* scale predictors if needed*/
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2601 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2602 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2603 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
2604
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2605 if(dc_pred_dir) { //left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2606 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2607 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
2608 } else { //top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2609 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2610 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
2611 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2612 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2613 if(dc_pred_dir) { //left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2614 for(k = 1; k < 8; k++)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2615 block[k << 3] += ac_val[k];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2616 } else { //top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2617 for(k = 1; k < 8; k++)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2618 block[k] += ac_val[k + 8];
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 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2621 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2622 /* save AC coeffs for further prediction */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2623 for(k = 1; k < 8; k++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2624 ac_val2[k] = block[k << 3];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2625 ac_val2[k + 8] = block[k];
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
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2628 /* scale AC coeffs */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2629 for(k = 1; k < 64; k++)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2630 if(block[k]) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2631 block[k] *= scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2632 if(!v->pquantizer)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2633 block[k] += (block[k] < 0) ? -mquant : mquant;
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 if(use_pred) i = 63;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2637 } else { // no AC coeffs
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2638 int k;
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 memset(ac_val2, 0, 16 * 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2641 if(dc_pred_dir) {//left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2642 if(use_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2643 memcpy(ac_val2, ac_val, 8 * 2);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2644 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2645 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2646 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
2647 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2648 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
2649 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2650 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2651 } else {//top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2652 if(use_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2653 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
2654 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2655 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2656 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
2657 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2658 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
2659 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2660 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2661 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2662
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2663 /* apply AC prediction if needed */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2664 if(use_pred) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2665 if(dc_pred_dir) { //left
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2666 for(k = 1; k < 8; k++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2667 block[k << 3] = ac_val2[k] * scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2668 if(!v->pquantizer && block[k << 3])
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2669 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
2670 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2671 } else { //top
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2672 for(k = 1; k < 8; k++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2673 block[k] = ac_val2[k + 8] * scale;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2674 if(!v->pquantizer && block[k])
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2675 block[k] += (block[k] < 0) ? -mquant : mquant;
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 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2678 i = 63;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2679 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2680 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2681 s->block_last_index[n] = i;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2682
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2683 return 0;
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
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2686 /** 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
2687 * @param v VC1Context
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2688 * @param block block to decode
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2689 * @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
2690 * @param mquant block quantizer
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2691 * @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
2692 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2693 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
2694 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2695 GetBitContext *gb = &v->s.gb;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2696 MpegEncContext *s = &v->s;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2697 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
2698 int run_diff, i;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3776
diff changeset
2699 int16_t *dc_val;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2700 int16_t *ac_val, *ac_val2;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2701 int dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2702 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
2703 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
2704 int use_pred = s->ac_pred;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2705 int scale;
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2706 int q1, q2 = 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2707
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2708 /* 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
2709 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
2710
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2711 /* 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
2712 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
2713 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
2714
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2715 /* Get DC differential */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2716 if (n < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2717 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
2718 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2719 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
2720 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2721 if (dcdiff < 0){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2722 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
2723 return -1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2724 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2725 if (dcdiff)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2726 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2727 if (dcdiff == 119 /* ESC index value */)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2728 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2729 /* TODO: Optimize */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2730 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
2731 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
2732 else dcdiff = get_bits(gb, 8);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2733 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2734 else
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2735 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2736 if (mquant == 1)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2737 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
2738 else if (mquant == 2)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2739 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
2740 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
2741 if (get_bits1(gb))
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2742 dcdiff = -dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2743 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2744
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2745 /* Prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2746 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
2747 *dc_val = dcdiff;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2748
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2749 /* 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
2750
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2751 if (n < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2752 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
2753 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2754 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
2755 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2756 /* Skip ? */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2757 run_diff = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2758 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2759
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2760 //AC Decoding
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2761 i = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2762
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2763 /* 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
2764 if(!a_avail) dc_pred_dir = 1;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2765 if(!c_avail) dc_pred_dir = 0;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2766 if(!a_avail && !c_avail) use_pred = 0;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2767 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
2768 ac_val2 = ac_val;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2769
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2770 scale = mquant * 2 + v->halfpq;
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2771
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2772 if(dc_pred_dir) //left
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2773 ac_val -= 16;
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2774 else //top
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2775 ac_val -= 16 * s->block_wrap[n];
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2776
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2777 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
2778 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
2779 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
2780 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
2781 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
2782 if(n==3) q2 = q1;
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2783
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2784 if(coded) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2785 int last = 0, skip, value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2786 const int8_t *zz_table;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2787 int k;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2788
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2789 zz_table = ff_vc1_simple_progressive_8x8_zz;
3360
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 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2792 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
2793 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2794 if(i > 63)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2795 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2796 block[zz_table[i++]] = value;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2797 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2798
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2799 /* apply AC prediction if needed */
3378
d7dda9fd99c8 Adjust AC prediction if (some) predictors are not available.
kostya
parents: 3377
diff changeset
2800 if(use_pred) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2801 /* scale predictors if needed*/
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2802 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2803 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2804 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
2805
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2806 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2807 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2808 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
2809 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2810 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2811 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
2812 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2813 } else {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2814 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2815 for(k = 1; k < 8; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2816 block[k << 3] += ac_val[k];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2817 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2818 for(k = 1; k < 8; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2819 block[k] += ac_val[k + 8];
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 }
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 /* save AC coeffs for further prediction */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2824 for(k = 1; k < 8; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2825 ac_val2[k] = block[k << 3];
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2826 ac_val2[k + 8] = block[k];
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2827 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2828
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2829 /* scale AC coeffs */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2830 for(k = 1; k < 64; k++)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2831 if(block[k]) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2832 block[k] *= scale;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2833 if(!v->pquantizer)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2834 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
2835 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2836
3378
d7dda9fd99c8 Adjust AC prediction if (some) predictors are not available.
kostya
parents: 3377
diff changeset
2837 if(use_pred) i = 63;
3399
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2838 } else { // no AC coeffs
3c6f5d05560d vc1_decode_intra_block() simplifications and corrections
kostya
parents: 3396
diff changeset
2839 int k;
3378
d7dda9fd99c8 Adjust AC prediction if (some) predictors are not available.
kostya
parents: 3377
diff changeset
2840
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2841 memset(ac_val2, 0, 16 * 2);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2842 if(dc_pred_dir) {//left
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2843 if(use_pred) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2844 memcpy(ac_val2, ac_val, 8 * 2);
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2845 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2846 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2847 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2848 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2849 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
2850 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2851 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2852 } else {//top
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2853 if(use_pred) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2854 memcpy(ac_val2 + 8, ac_val + 8, 8 * 2);
3429
fb2a69de8ded Enable coefficient scaling
kostya
parents: 3428
diff changeset
2855 if(q2 && q1!=q2) {
4236
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2856 q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
aee20d5bd41f Use halfpq in coefficient scaling
kostya
parents: 4209
diff changeset
2857 q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2858 for(k = 1; k < 8; k++)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2859 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
2860 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2861 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2862 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2863
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2864 /* apply AC prediction if needed */
3378
d7dda9fd99c8 Adjust AC prediction if (some) predictors are not available.
kostya
parents: 3377
diff changeset
2865 if(use_pred) {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2866 if(dc_pred_dir) { //left
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2867 for(k = 1; k < 8; k++) {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2868 block[k << 3] = ac_val2[k] * scale;
3509
da6095607f26 Don't do non-uniform quantization on zero coeffs.
kostya
parents: 3508
diff changeset
2869 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
2870 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
2871 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2872 } else { //top
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2873 for(k = 1; k < 8; k++) {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
2874 block[k] = ac_val2[k + 8] * scale;
3509
da6095607f26 Don't do non-uniform quantization on zero coeffs.
kostya
parents: 3508
diff changeset
2875 if(!v->pquantizer && block[k])
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2876 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
2877 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2878 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2879 i = 63;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2880 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
2881 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2882 s->block_last_index[n] = i;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2883
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2884 return 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2885 }
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 /** Decode P block
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2888 */
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2889 static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquant, int ttmb, int first_block)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2890 {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2891 MpegEncContext *s = &v->s;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2892 GetBitContext *gb = &s->gb;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2893 int i, j;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2894 int subblkpat = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2895 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
2896 int ttblk = ttmb & 7;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2897
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2898 if(ttmb == -1) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2899 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
2900 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2901 if(ttblk == TT_4X4) {
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2902 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
2903 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2904 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
2905 subblkpat = decode012(gb);
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
2906 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
2907 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
2908 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
2909 }
4948
74caff45a271 Use correct dequantizer value
kostya
parents: 4929
diff changeset
2910 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
2911
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2912 // 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
2913 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
2914 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
2915 ttblk = TT_8X4;
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 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
2918 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
2919 ttblk = TT_4X8;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2920 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2921 switch(ttblk) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2922 case TT_8X8:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2923 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2924 last = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2925 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2926 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
2927 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2928 if(i > 63)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2929 break;
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2930 idx = ff_vc1_simple_progressive_8x8_zz[i++];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2931 block[idx] = value * scale;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2932 if(!v->pquantizer)
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2933 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
2934 }
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
2935 s->dsp.vc1_inv_trans_8x8(block);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2936 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2937 case TT_4X4:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2938 for(j = 0; j < 4; j++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2939 last = subblkpat & (1 << (3 - j));
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2940 i = 0;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2941 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
2942 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2943 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
2944 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2945 if(i > 15)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2946 break;
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2947 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
2948 block[idx + off] = value * scale;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2949 if(!v->pquantizer)
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2950 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
2951 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2952 if(!(subblkpat & (1 << (3 - j))))
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
2953 s->dsp.vc1_inv_trans_4x4(block, j);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2954 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2955 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2956 case TT_8X4:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2957 for(j = 0; j < 2; j++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2958 last = subblkpat & (1 << (1 - j));
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2959 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2960 off = j * 32;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2961 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2962 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
2963 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2964 if(i > 31)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2965 break;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2966 if(v->profile < PROFILE_ADVANCED)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2967 idx = ff_vc1_simple_progressive_8x4_zz[i++];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2968 else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2969 idx = ff_vc1_adv_progressive_8x4_zz[i++];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2970 block[idx + off] = value * scale;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2971 if(!v->pquantizer)
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2972 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
2973 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2974 if(!(subblkpat & (1 << (1 - j))))
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
2975 s->dsp.vc1_inv_trans_8x4(block, j);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2976 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2977 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2978 case TT_4X8:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2979 for(j = 0; j < 2; j++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2980 last = subblkpat & (1 << (1 - j));
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2981 i = 0;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2982 off = j * 4;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2983 while (!last) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2984 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
2985 i += skip;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2986 if(i > 31)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2987 break;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2988 if(v->profile < PROFILE_ADVANCED)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2989 idx = ff_vc1_simple_progressive_4x8_zz[i++];
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
2990 else
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
2991 idx = ff_vc1_adv_progressive_4x8_zz[i++];
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
2992 block[idx + off] = value * scale;
3475
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2993 if(!v->pquantizer)
4e06affe9974 Correct inverse quantization for P-frames
kostya
parents: 3474
diff changeset
2994 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
2995 }
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
2996 if(!(subblkpat & (1 << (1 - j))))
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
2997 s->dsp.vc1_inv_trans_4x8(block, j);
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 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3000 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3001 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3002 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3003
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3004
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3005 /** 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
3006 */
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3007 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
3008 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3009 MpegEncContext *s = &v->s;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3010 GetBitContext *gb = &s->gb;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3011 int i, j;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3012 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
3013 int cbp; /* cbp decoding stuff */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3014 int mqdiff, mquant; /* MB quantization */
3405
58c4fd135462 Correctly choose global transform mode, MV mode and fix bitplane decoding
kostya
parents: 3404
diff changeset
3015 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
3016 int status;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3017
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3018 static const int size_table[6] = { 0, 2, 3, 4, 5, 8 },
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3019 offset_table[6] = { 0, 1, 3, 7, 15, 31 };
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3020 int mb_has_coeffs = 1; /* last_flag */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3021 int dmv_x, dmv_y; /* Differential MV components */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3022 int index, index1; /* LUT indices */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3023 int val, sign; /* temp values */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3024 int first_block = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3025 int dst_idx, off;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3026 int skipped, fourmv;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3027
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3028 mquant = v->pq; /* Loosy initialization */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3029
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3030 if (v->mv_type_is_raw)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3031 fourmv = get_bits1(gb);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3032 else
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3033 fourmv = v->mv_type_mb_plane[mb_pos];
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3034 if (v->skip_is_raw)
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3035 skipped = get_bits1(gb);
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3036 else
3375
a1c2e1603be9 Use MpegEncContext->mbskip_table instead of custom bitplane.
kostya
parents: 3371
diff changeset
3037 skipped = v->s.mbskip_table[mb_pos];
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3038
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3039 s->dsp.clear_blocks(s->block[0]);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3040
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3041 if (!fourmv) /* 1MV mode */
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3042 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3043 if (!skipped)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3044 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3045 GET_MVDATA(dmv_x, dmv_y);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3046
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3047 if (s->mb_intra) {
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3048 s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3049 s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3050 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3051 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
3052 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
3053
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3054 /* FIXME Set DC val for inter block ? */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3055 if (s->mb_intra && !mb_has_coeffs)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3056 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3057 GET_MQUANT();
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3058 s->ac_pred = get_bits1(gb);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3059 cbp = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3060 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3061 else if (mb_has_coeffs)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3062 {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3063 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
3064 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
3065 GET_MQUANT();
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3066 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3067 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3068 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3069 mquant = v->pq;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3070 cbp = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3071 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3072 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
3073
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3074 if (!v->ttmbf && !s->mb_intra && mb_has_coeffs)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3075 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
3076 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
3077 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
3078 dst_idx = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3079 for (i=0; i<6; i++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3080 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3081 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
3082 dst_idx += i >> 2;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3083 val = ((cbp >> (5 - i)) & 1);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3084 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3085 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
3086 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
3087 /* 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
3088 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
3089 if(i == 2 || i == 3 || !s->first_slice_line)
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3090 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
3091 if(i == 1 || i == 3 || s->mb_x)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3092 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
3093
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3094 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
3095 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
3096 s->dsp.vc1_inv_trans_8x8(s->block[i]);
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
3097 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3098 for(j = 0; j < 64; j++) s->block[i][j] += 128;
4604
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
3099 if(!v->res_fasttx && v->res_x8) for(j = 0; j < 64; j++) s->block[i][j] += 16;
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3100 s->dsp.put_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
3101 if(v->pq >= 9 && v->overlap) {
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3102 if(v->c_avail)
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3103 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
3104 if(v->a_avail)
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3105 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
3106 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3107 } else if(val) {
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3108 vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3109 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
3110 first_block = 0;
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3111 if((i<4) || !(s->flags & CODEC_FLAG_GRAY))
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3112 s->dsp.add_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3113 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3114 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3115 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3116 else //Skipped
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3117 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3118 s->mb_intra = 0;
3507
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3119 for(i = 0; i < 6; i++) {
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3120 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
3121 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
3122 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3123 s->current_picture.mb_type[mb_pos] = MB_TYPE_SKIP;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3124 s->current_picture.qscale_table[mb_pos] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3125 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
3126 vc1_mc_1mv(v, 0);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3127 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3128 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3129 } //1MV mode
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3130 else //4MV mode
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3131 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3132 if (!skipped /* unskipped MB */)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3133 {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3134 int intra_count = 0, coded_inter = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3135 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
3136 /* Get CBPCY */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3137 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
3138 for (i=0; i<6; i++)
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3139 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3140 val = ((cbp >> (5 - i)) & 1);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3141 s->dc_val[0][s->block_index[i]] = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3142 s->mb_intra = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3143 if(i < 4) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3144 dmv_x = dmv_y = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3145 s->mb_intra = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3146 mb_has_coeffs = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3147 if(val) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3148 GET_MVDATA(dmv_x, dmv_y);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3149 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3150 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
3151 if(!s->mb_intra) vc1_mc_4mv_luma(v, i);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3152 intra_count += s->mb_intra;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3153 is_intra[i] = s->mb_intra;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3154 is_coded[i] = mb_has_coeffs;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3155 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3156 if(i&4){
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3157 is_intra[i] = (intra_count >= 3);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3158 is_coded[i] = val;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3159 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3160 if(i == 4) vc1_mc_4mv_chroma(v);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3161 v->mb_type[0][s->block_index[i]] = is_intra[i];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3162 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
3163 }
3453
e3f5377bddb2 Check if 4-MV MB should not be decoded.
kostya
parents: 3452
diff changeset
3164 // 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
3165 if(!intra_count && !coded_inter) return 0;
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3166 dst_idx = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3167 GET_MQUANT();
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3168 s->current_picture.qscale_table[mb_pos] = mquant;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3169 /* test if block is intra and has pred */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3170 {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3171 int intrapred = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3172 for(i=0; i<6; i++)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3173 if(is_intra[i]) {
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
3174 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
3175 || ((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
3176 intrapred = 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3177 break;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3178 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3179 }
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3180 if(intrapred)s->ac_pred = get_bits1(gb);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3181 else s->ac_pred = 0;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3182 }
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3183 if (!v->ttmbf && coded_inter)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3184 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
3185 for (i=0; i<6; i++)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3186 {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3187 dst_idx += i >> 2;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3188 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3189 s->mb_intra = is_intra[i];
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3190 if (is_intra[i]) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3191 /* check if prediction blocks A and C are available */
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3192 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
3193 if(i == 2 || i == 3 || !s->first_slice_line)
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3194 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
3195 if(i == 1 || i == 3 || s->mb_x)
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3196 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
3197
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3198 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
3199 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
3200 s->dsp.vc1_inv_trans_8x8(s->block[i]);
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
3201 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3202 for(j = 0; j < 64; j++) s->block[i][j] += 128;
4604
40cd5f7f34e7 WMV3 Complex Profile initial support
kostya
parents: 4594
diff changeset
3203 if(!v->res_fasttx && v->res_x8) for(j = 0; j < 64; j++) s->block[i][j] += 16;
3400
84de54d536bd 4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents: 3399
diff changeset
3204 s->dsp.put_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
3205 if(v->pq >= 9 && v->overlap) {
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3206 if(v->c_avail)
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3207 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
3208 if(v->a_avail)
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3209 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
3210 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3211 } else if(is_coded[i]) {
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3212 status = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3213 if(!v->ttmbf && ttmb < 8) ttmb = -1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3214 first_block = 0;
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3215 if((i<4) || !(s->flags & CODEC_FLAG_GRAY))
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3216 s->dsp.add_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3217 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3218 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3219 return status;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3220 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3221 else //Skipped MB
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3222 {
3400
84de54d536bd 4-MV mode final fixes (now it works for non-exotic modes)
kostya
parents: 3399
diff changeset
3223 s->mb_intra = 0;
3514
db3335b2b8f1 Some fixes for decode_p_mb()
kostya
parents: 3513
diff changeset
3224 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
3225 for (i=0; i<6; i++) {
44e0a262d500 Set DC = 0 for skipped MB as it interferes DC prediction
kostya
parents: 3506
diff changeset
3226 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
3227 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
3228 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3229 for (i=0; i<4; i++)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3230 {
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3231 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
3232 vc1_mc_4mv_luma(v, i);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3233 }
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3234 vc1_mc_4mv_chroma(v);
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3235 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
3236 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3237 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3238 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3239
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3240 /* Should never happen */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3241 return -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3242 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3243
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3244 /** 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
3245 */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3246 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
3247 {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3248 MpegEncContext *s = &v->s;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3249 GetBitContext *gb = &s->gb;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3250 int i, j;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3251 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
3252 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
3253 int mqdiff, mquant; /* MB quantization */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3254 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
3255
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3256 static const int size_table[6] = { 0, 2, 3, 4, 5, 8 },
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3257 offset_table[6] = { 0, 1, 3, 7, 15, 31 };
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3258 int mb_has_coeffs = 0; /* last_flag */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3259 int index, index1; /* LUT indices */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3260 int val, sign; /* temp values */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3261 int first_block = 1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3262 int dst_idx, off;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3263 int skipped, direct;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3264 int dmv_x[2], dmv_y[2];
3690
35aae593db08 [Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents: 3689
diff changeset
3265 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
3266
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3267 mquant = v->pq; /* Loosy initialization */
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3268 s->mb_intra = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3269
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3270 if (v->dmb_is_raw)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3271 direct = get_bits1(gb);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3272 else
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3273 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
3274 if (v->skip_is_raw)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3275 skipped = get_bits1(gb);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3276 else
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3277 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
3278
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3279 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
3280 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
3281 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
3282 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
3283 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
3284 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3285 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
3286
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3287 if (!direct) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3288 if (!skipped) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3289 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
3290 dmv_x[1] = dmv_x[0];
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3291 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
3292 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3293 if(skipped || !s->mb_intra) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3294 bmvtype = decode012(gb);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3295 switch(bmvtype) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3296 case 0:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3297 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
3298 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3299 case 1:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3300 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
3301 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3302 case 2:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3303 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
3304 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
3305 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3306 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3307 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3308 for(i = 0; i < 6; i++)
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3309 v->mb_type[0][s->block_index[i]] = s->mb_intra;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3310
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3311 if (skipped) {
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3312 if(direct) bmvtype = BMV_TYPE_INTERPOLATED;
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3313 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
3314 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
3315 return;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3316 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3317 if (direct) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3318 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
3319 GET_MQUANT();
3553
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3320 s->mb_intra = 0;
a542b0325239 Correct MC for B-frames and some improvements (not 100% complete though)
kostya
parents: 3552
diff changeset
3321 mb_has_coeffs = 0;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3322 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
3323 if(!v->ttmbf)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3324 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
3325 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
3326 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
3327 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
3328 } else {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3329 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
3330 /* no coded blocks - effectively skipped */
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3331 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
3332 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
3333 return;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3334 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3335 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
3336 GET_MQUANT();
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3337 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
3338 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
3339 cbp = 0;
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3340 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
3341 } else {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3342 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
3343 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
3344 if(!mb_has_coeffs) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3345 /* interpolated skipped block */
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3346 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
3347 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
3348 return;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3349 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3350 }
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3351 vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3352 if(!s->mb_intra) {
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3353 vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3354 }
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3355 if(s->mb_intra)
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3356 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
3357 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
3358 GET_MQUANT();
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3359 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
3360 if(!v->ttmbf && !s->mb_intra && mb_has_coeffs)
4949
845386be542c Add ff_ prefix to (externally) visible variables
kostya
parents: 4948
diff changeset
3361 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
3362 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3363 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3364 dst_idx = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3365 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
3366 {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3367 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
3368 dst_idx += i >> 2;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3369 val = ((cbp >> (5 - i)) & 1);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3370 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
3371 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
3372 if(s->mb_intra) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3373 /* 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
3374 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
3375 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
3376 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
3377 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
3378 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
3379
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3380 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
3381 if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
3382 s->dsp.vc1_inv_trans_8x8(s->block[i]);
3522
5de1edac254e Support range reduced frames
kostya
parents: 3521
diff changeset
3383 if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3384 for(j = 0; j < 64; j++) s->block[i][j] += 128;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3385 s->dsp.put_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3386 } else if(val) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3387 vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3388 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
3389 first_block = 0;
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3390 if((i<4) || !(s->flags & CODEC_FLAG_GRAY))
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3391 s->dsp.add_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3392 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3393 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3394 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3395
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3396 /** Decode blocks of I-frame
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3397 */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3398 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
3399 {
3450
906c58dcb6ea Use overlap filter instead of loop filter.
kostya
parents: 3449
diff changeset
3400 int k, j;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3401 MpegEncContext *s = &v->s;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3402 int cbp, val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3403 uint8_t *coded_val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3404 int mb_pos;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3405
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3406 /* 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
3407 switch(v->y_ac_table_index){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3408 case 0:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3409 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
3410 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3411 case 1:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3412 v->codingset = CS_HIGH_MOT_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3413 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3414 case 2:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3415 v->codingset = CS_MID_RATE_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3416 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3417 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3418
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3419 switch(v->c_ac_table_index){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3420 case 0:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3421 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
3422 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3423 case 1:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3424 v->codingset2 = CS_HIGH_MOT_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3425 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3426 case 2:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3427 v->codingset2 = CS_MID_RATE_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3428 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3429 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3430
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3431 /* 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
3432 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
3433 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
3434
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3435 //do frame decode
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3436 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
3437 s->mb_intra = 1;
3449
ec6096b1ab04 Use s->first_slice_line in checks instead of s->mb_y
kostya
parents: 3430
diff changeset
3438 s->first_slice_line = 1;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3439 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3440 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
3441 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
3442 ff_init_block_index(s);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3443 ff_update_block_index(s);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3444 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
3445 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
3446 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
3447 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
3448 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
3449 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
3450
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3451 // do actual MB decoding and displaying
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3452 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
3453 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
3454
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3455 for(k = 0; k < 6; k++) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3456 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
3457
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3458 if (k < 4) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3459 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
3460 val = val ^ pred;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3461 *coded_val = val;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3462 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3463 cbp |= val << (5 - k);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3464
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3465 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
3466
3527
3187e7ffe52d Use functions from DSPContext in vc1.c
kostya
parents: 3523
diff changeset
3467 s->dsp.vc1_inv_trans_8x8(s->block[k]);
4741
17f982d0141b One more FASTTX-related hack
kostya
parents: 4724
diff changeset
3468 if(!v->res_fasttx && !v->res_x8) for(j = 0; j < 64; j++) s->block[k][j] -= 16;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3469 if(v->pq >= 9 && v->overlap) {
3450
906c58dcb6ea Use overlap filter instead of loop filter.
kostya
parents: 3449
diff changeset
3470 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
3471 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3472 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3473
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3474 vc1_put_block(v, s->block);
3690
35aae593db08 [Cosmetics] Remove some done TODOs/FIXMEs from comments
kostya
parents: 3689
diff changeset
3475 if(v->pq >= 9 && v->overlap) {
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3476 if(s->mb_x) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3477 s->dsp.vc1_h_overlap(s->dest[0], s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3478 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
3479 if(!(s->flags & CODEC_FLAG_GRAY)) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3480 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3481 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize);
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3482 }
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3483 }
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3484 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3485 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
3486 if(!s->first_slice_line) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3487 s->dsp.vc1_v_overlap(s->dest[0], s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3488 s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize);
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3489 if(!(s->flags & CODEC_FLAG_GRAY)) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3490 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3491 s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize);
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3492 }
3364
59c10b66fbbc Added loop filtering as ersatz for overlap filter (improves picture quality for coarse quantization).
kostya
parents: 3363
diff changeset
3493 }
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3494 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
3495 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
3496 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3497
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3498 if(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
3499 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
3500 return;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3501 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3502 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3503 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
3504 s->first_slice_line = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3505 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3506 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3507
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3508 /** 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
3509 */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3510 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
3511 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3512 int k, j;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3513 MpegEncContext *s = &v->s;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3514 int cbp, val;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3515 uint8_t *coded_val;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3516 int mb_pos;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3517 int mquant = v->pq;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3518 int mqdiff;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3519 int overlap;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3520 GetBitContext *gb = &s->gb;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3521
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3522 /* select codingmode used for VLC tables selection */
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3523 switch(v->y_ac_table_index){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3524 case 0:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3525 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
3526 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3527 case 1:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3528 v->codingset = CS_HIGH_MOT_INTRA;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3529 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3530 case 2:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3531 v->codingset = CS_MID_RATE_INTRA;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3532 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3533 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3534
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3535 switch(v->c_ac_table_index){
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3536 case 0:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3537 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
3538 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3539 case 1:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3540 v->codingset2 = CS_HIGH_MOT_INTER;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3541 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3542 case 2:
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3543 v->codingset2 = CS_MID_RATE_INTER;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3544 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3545 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3546
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3547 //do frame decode
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3548 s->mb_x = s->mb_y = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3549 s->mb_intra = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3550 s->first_slice_line = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3551 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
3552 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
3553 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
3554 ff_init_block_index(s);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3555 ff_update_block_index(s);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3556 s->dsp.clear_blocks(s->block[0]);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3557 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
3558 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
3559 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
3560 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
3561
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3562 // do actual MB decoding and displaying
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3563 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
3564 if(v->acpred_is_raw)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3565 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
3566 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3567 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
3568
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3569 if(v->condover == CONDOVER_SELECT) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3570 if(v->overflg_is_raw)
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5511
diff changeset
3571 overlap = get_bits1(&v->s.gb);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3572 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3573 overlap = v->over_flags_plane[mb_pos];
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3574 } else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3575 overlap = (v->condover == CONDOVER_ALL);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3576
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3577 GET_MQUANT();
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3578
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3579 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
3580 /* 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
3581 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
3582 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
3583
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3584 for(k = 0; k < 6; k++) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3585 val = ((cbp >> (5 - k)) & 1);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3586
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3587 if (k < 4) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3588 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
3589 val = val ^ pred;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3590 *coded_val = val;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3591 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3592 cbp |= val << (5 - k);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3593
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3594 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
3595 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
3596
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3597 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
3598
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3599 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
3600 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
3601 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3602
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3603 vc1_put_block(v, s->block);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3604 if(overlap) {
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3605 if(s->mb_x) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3606 s->dsp.vc1_h_overlap(s->dest[0], s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3607 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
3608 if(!(s->flags & CODEC_FLAG_GRAY)) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3609 s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3610 s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize);
4209
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3611 }
ec6d49d9c19d Overlap filtering was done in reverse order
kostya
parents: 4001
diff changeset
3612 }
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3613 s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3614 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
3615 if(!s->first_slice_line) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3616 s->dsp.vc1_v_overlap(s->dest[0], s->linesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3617 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
3618 if(!(s->flags & CODEC_FLAG_GRAY)) {
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3619 s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize);
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3620 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
3621 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3622 }
4239
30b14d0f2324 Correct rounding values in overlap filtering
kostya
parents: 4238
diff changeset
3623 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
3624 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
3625 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3626
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3627 if(get_bits_count(&s->gb) > v->bits) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3628 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
3629 return;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3630 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3631 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3632 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
3633 s->first_slice_line = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3634 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3635 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3636
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3637 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
3638 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3639 MpegEncContext *s = &v->s;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3640
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3641 /* 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
3642 switch(v->c_ac_table_index){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3643 case 0:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3644 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
3645 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3646 case 1:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3647 v->codingset = CS_HIGH_MOT_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3648 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3649 case 2:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3650 v->codingset = CS_MID_RATE_INTRA;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3651 break;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3652 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3653
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3654 switch(v->c_ac_table_index){
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3655 case 0:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3656 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
3657 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3658 case 1:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3659 v->codingset2 = CS_HIGH_MOT_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3660 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3661 case 2:
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3662 v->codingset2 = CS_MID_RATE_INTER;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3663 break;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3664 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3665
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3666 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3667 s->first_slice_line = 1;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3668 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
3669 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
3670 ff_init_block_index(s);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3671 ff_update_block_index(s);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3672 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
3673
3476
33a177588139 Don't pass block[6][64] parameter to decode_p_mb as we always use s->block
kostya
parents: 3475
diff changeset
3674 vc1_decode_p_mb(v);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3675 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3676 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
3677 return;
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 }
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3680 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
3681 s->first_slice_line = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3682 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3683 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3684
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3685 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
3686 {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3687 MpegEncContext *s = &v->s;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3688
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3689 /* 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
3690 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
3691 case 0:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3692 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
3693 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3694 case 1:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3695 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
3696 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3697 case 2:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3698 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
3699 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3700 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3701
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3702 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
3703 case 0:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3704 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
3705 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3706 case 1:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3707 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
3708 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3709 case 2:
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3710 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
3711 break;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3712 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3713
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3714 ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3715 s->first_slice_line = 1;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3716 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
3717 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
3718 ff_init_block_index(s);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3719 ff_update_block_index(s);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3720 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
3721
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3722 vc1_decode_b_mb(v);
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3723 if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) {
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3724 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
3725 return;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3726 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3727 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3728 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
3729 s->first_slice_line = 0;
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3730 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3731 }
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3732
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3733 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
3734 {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3735 MpegEncContext *s = &v->s;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3736
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3737 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
3738 s->first_slice_line = 1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3739 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
3740 s->mb_x = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3741 ff_init_block_index(s);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3742 ff_update_block_index(s);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3743 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
3744 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
3745 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
3746 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
3747 s->first_slice_line = 0;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3748 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3749 s->pict_type = P_TYPE;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3750 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3751
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3752 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
3753 {
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3754
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3755 v->s.esc3_level_length = 0;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3756
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3757 switch(v->s.pict_type) {
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3758 case I_TYPE:
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3759 if(v->profile == PROFILE_ADVANCED)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3760 vc1_decode_i_blocks_adv(v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3761 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3762 vc1_decode_i_blocks(v);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3763 break;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3764 case P_TYPE:
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3765 if(v->p_frame_skipped)
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3766 vc1_decode_skip_blocks(v);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3767 else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3768 vc1_decode_p_blocks(v);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3769 break;
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3770 case B_TYPE:
4433
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3771 if(v->bi_type){
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3772 if(v->profile == PROFILE_ADVANCED)
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3773 vc1_decode_i_blocks_adv(v);
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3774 else
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3775 vc1_decode_i_blocks(v);
8187c306ffcd Fix BI-frames decoding for Adv. profile
kostya
parents: 4414
diff changeset
3776 }else
3689
6d9e8253da2a Proper support for B/BI frames
kostya
parents: 3672
diff changeset
3777 vc1_decode_b_blocks(v);
3515
20938be7b67b Some B-frames support (parsing and decoding only, no motion compesation is done)
kostya
parents: 3514
diff changeset
3778 break;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3779 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3780 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3781
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3782 /** Find VC-1 marker in buffer
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3783 * @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
3784 */
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3785 static av_always_inline uint8_t* find_next_marker(uint8_t *src, uint8_t *end)
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3786 {
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3787 uint32_t mrk = 0xFFFFFFFF;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3788
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3789 if(end-src < 4) return end;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3790 while(src < end){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3791 mrk = (mrk << 8) | *src++;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3792 if(IS_MARKER(mrk))
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3793 return src-4;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3794 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3795 return end;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3796 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3797
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3798 static av_always_inline int vc1_unescape_buffer(uint8_t *src, int size, uint8_t *dst)
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3799 {
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3800 int dsize = 0, i;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3801
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3802 if(size < 4){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3803 for(dsize = 0; dsize < size; dsize++) *dst++ = *src++;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3804 return size;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3805 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3806 for(i = 0; i < size; i++, src++) {
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3807 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
3808 dst[dsize++] = src[1];
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3809 src++;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3810 i++;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3811 } else
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3812 dst[dsize++] = *src;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3813 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3814 return dsize;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3815 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3816
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3817 /** Initialize a VC1/WMV3 decoder
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3818 * @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
3819 * @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
3820 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3821 static int vc1_decode_init(AVCodecContext *avctx)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3822 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3823 VC1Context *v = avctx->priv_data;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3824 MpegEncContext *s = &v->s;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3825 GetBitContext gb;
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 if (!avctx->extradata_size || !avctx->extradata) return -1;
3521
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3828 if (!(avctx->flags & CODEC_FLAG_GRAY))
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3829 avctx->pix_fmt = PIX_FMT_YUV420P;
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3830 else
ae749c2da968 Support grayscale decoding.
kostya
parents: 3520
diff changeset
3831 avctx->pix_fmt = PIX_FMT_GRAY8;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3832 v->s.avctx = avctx;
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3833 avctx->flags |= CODEC_FLAG_EMU_EDGE;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3834 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
3835
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3836 if(ff_h263_decode_init(avctx) < 0)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3837 return -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3838 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
3839
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3840 avctx->coded_width = avctx->width;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3841 avctx->coded_height = avctx->height;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3842 if (avctx->codec_id == CODEC_ID_WMV3)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3843 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3844 int count = 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3845
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3846 // 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
3847 // 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
3848 // 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
3849 // samples we can decode
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3850
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3851 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
3852
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3853 if (decode_sequence_header(avctx, &gb) < 0)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3854 return -1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3855
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3856 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
3857 if (count>0)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3858 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3859 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
3860 count, get_bits(&gb, count));
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3861 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3862 else if (count < 0)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3863 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3864 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
3865 }
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3866 } else { // VC1/WVC1
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3867 uint8_t *start = avctx->extradata, *end = avctx->extradata + avctx->extradata_size;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3868 uint8_t *next; int size, buf2_size;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3869 uint8_t *buf2 = NULL;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3870 int seq_inited = 0, ep_inited = 0;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3871
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3872 if(avctx->extradata_size < 16) {
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3873 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
3874 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3875 }
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3876
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3877 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
3878 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
3879 next = start;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3880 for(; next < end; start = next){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3881 next = find_next_marker(start + 4, end);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3882 size = next - start - 4;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3883 if(size <= 0) continue;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3884 buf2_size = vc1_unescape_buffer(start + 4, size, buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3885 init_get_bits(&gb, buf2, buf2_size * 8);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3886 switch(AV_RB32(start)){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3887 case VC1_CODE_SEQHDR:
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3888 if(decode_sequence_header(avctx, &gb) < 0){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3889 av_free(buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3890 return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3891 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3892 seq_inited = 1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3893 break;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3894 case VC1_CODE_ENTRYPOINT:
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3895 if(decode_entry_point(avctx, &gb) < 0){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3896 av_free(buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3897 return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3898 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3899 ep_inited = 1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3900 break;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3901 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3902 }
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3903 av_free(buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3904 if(!seq_inited || !ep_inited){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3905 av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n");
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3906 return -1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3907 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3908 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3909 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
3910 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
3911
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3912 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
3913 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
3914
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3915 /* Allocate mb bitplanes */
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3916 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
3917 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
3918 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
3919 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
3920
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3921 /* 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
3922 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
3923 v->mb_type[0] = v->mb_type_base + s->b8_stride + 1;
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
3924 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
3925 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
3926
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3927 /* Init coded blocks info */
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3928 if (v->profile == PROFILE_ADVANCED)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3929 {
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3930 // 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
3931 // return -1;
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
3932 // 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
3933 // return -1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3934 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3935
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3936 return 0;
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3937 }
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
3938
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3939
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3940 /** Decode a VC1/WMV3 frame
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3941 * @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
3942 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3943 static int vc1_decode_frame(AVCodecContext *avctx,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3944 void *data, int *data_size,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3945 uint8_t *buf, int buf_size)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3946 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3947 VC1Context *v = avctx->priv_data;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3948 MpegEncContext *s = &v->s;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3949 AVFrame *pict = data;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
3950 uint8_t *buf2 = NULL;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3951
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3952 /* no supplementary picture */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3953 if (buf_size == 0) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3954 /* special case for last picture */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3955 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
3956 *pict= *(AVFrame*)s->next_picture_ptr;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3957 s->next_picture_ptr= NULL;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3958
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3959 *data_size = sizeof(AVFrame);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3960 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3961
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3962 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3963 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3964
5127
4dbe6578f811 misc spelling fixes
diego
parents: 4966
diff changeset
3965 /* We need to set current_picture_ptr before reading the header,
5128
kostya
parents: 5127
diff changeset
3966 * 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
3967 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
3968 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
3969 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
3970 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
3971
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3972 //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
3973 if (avctx->codec_id == CODEC_ID_VC1) {
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3974 int buf_size2 = 0;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3975 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
3976
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3977 if(IS_MARKER(AV_RB32(buf))){ /* frame starts with marker and needs to be parsed */
4873
6a1e340119df Remove unused variable.
diego
parents: 4859
diff changeset
3978 uint8_t *start, *end, *next;
4462
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3979 int size;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3980
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3981 next = buf;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3982 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
3983 next = find_next_marker(start + 4, end);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3984 size = next - start - 4;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3985 if(size <= 0) continue;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3986 switch(AV_RB32(start)){
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3987 case VC1_CODE_FRAME:
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3988 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3989 break;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3990 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
3991 buf_size2 = vc1_unescape_buffer(start + 4, size, buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3992 init_get_bits(&s->gb, buf2, buf_size2*8);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3993 decode_entry_point(avctx, &s->gb);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3994 break;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3995 case VC1_CODE_SLICE:
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3996 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
3997 av_free(buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3998 return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
3999 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4000 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4001 }else if(v->interlace && ((buf[0] & 0xC0) == 0xC0)){ /* WVC1 interlaced stores both fields divided by marker */
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4002 uint8_t *divider;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4003
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4004 divider = find_next_marker(buf, buf + buf_size);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4005 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
4006 av_log(avctx, AV_LOG_ERROR, "Error in WVC1 interlaced frame\n");
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4007 return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4008 }
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4009
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4010 buf_size2 = vc1_unescape_buffer(buf, divider - buf, buf2);
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4011 // TODO
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4012 av_free(buf2);return -1;
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4013 }else{
d47a98f52e25 General approach to parsing chunks in VC-1 AP
kostya
parents: 4456
diff changeset
4014 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
4015 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4016 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
4017 } else
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4018 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
4019 // do parse frame header
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4020 if(v->profile < PROFILE_ADVANCED) {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4021 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
4022 av_free(buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4023 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4024 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4025 } else {
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4026 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
4027 av_free(buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4028 return -1;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4029 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4030 }
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4031
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4032 if(s->pict_type != 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
4033 av_free(buf2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4034 return -1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4035 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4036
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4037 // for hurry_up==5
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4038 s->current_picture.pict_type= s->pict_type;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4039 s->current_picture.key_frame= s->pict_type == I_TYPE;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4040
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4041 /* skip B-frames if we don't have reference frames */
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4042 if(s->last_picture_ptr==NULL && (s->pict_type==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
4043 av_free(buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4044 return -1;//buf_size;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4045 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4046 /* skip b frames if we are in a hurry */
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4047 if(avctx->hurry_up && s->pict_type==B_TYPE) return -1;//buf_size;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4048 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==B_TYPE)
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4049 || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=I_TYPE)
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4050 || 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
4051 av_free(buf2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4052 return buf_size;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4053 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4054 /* 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
4055 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
4056 av_free(buf2);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4057 return -1;//buf_size;
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4058 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4059
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4060 if(s->next_p_frame_damaged){
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4061 if(s->pict_type==B_TYPE)
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4062 return buf_size;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4063 else
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4064 s->next_p_frame_damaged=0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4065 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4066
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4067 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
4068 av_free(buf2);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4069 return -1;
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4070 }
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4071
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4072 ff_er_frame_start(s);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4073
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4074 v->bits = buf_size * 8;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4075 vc1_decode_blocks(v);
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4076 //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
4077 // 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
4078 // return -1;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4079 ff_er_frame_end(s);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4080
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4081 MPV_frame_end(s);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4082
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4083 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
4084 assert(s->current_picture.pict_type == s->pict_type);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4085 if (s->pict_type == B_TYPE || s->low_delay) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4086 *pict= *(AVFrame*)s->current_picture_ptr;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4087 } else if (s->last_picture_ptr != NULL) {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4088 *pict= *(AVFrame*)s->last_picture_ptr;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4089 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4090
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4091 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
4092 *data_size = sizeof(AVFrame);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4093 ff_print_debug_info(s, pict);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4094 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4095
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4096 /* Return the Picture timestamp as the frame number */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4097 /* we substract 1 because it is added on utils.c */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4098 avctx->frame_number = s->picture_number - 1;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4099
3694
8765ee4eaa45 Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.
kostya
parents: 3693
diff changeset
4100 av_free(buf2);
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4101 return buf_size;
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4102 }
3359
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
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4105 /** Close a VC1/WMV3 decoder
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4106 * @warning Initial try at using MpegEncContext stuff
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4107 */
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4108 static int vc1_decode_end(AVCodecContext *avctx)
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4109 {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4110 VC1Context *v = avctx->priv_data;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4111
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4112 av_freep(&v->hrd_rate);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4113 av_freep(&v->hrd_buffer);
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4114 MPV_common_end(&v->s);
3367
8c7b8ffc2485 Some optimization and fixes - mostly reworked MC and bitplanes.
kostya
parents: 3366
diff changeset
4115 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
4116 av_freep(&v->direct_mb_plane);
3672
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4117 av_freep(&v->acpred_plane);
9d4583fe8fca VC-1 Advanced Profile support (progressive only, tested on WVC1 samples)
kostya
parents: 3664
diff changeset
4118 av_freep(&v->over_flags_plane);
3396
3f43459705a5 4-MV decoding support
kostya
parents: 3378
diff changeset
4119 av_freep(&v->mb_type_base);
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4120 return 0;
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4121 }
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4122
3360
2c4ddf5b9217 VC-1 decoder with I-frames support and partial P-frames decoding
kostya
parents: 3359
diff changeset
4123
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4124 AVCodec vc1_decoder = {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4125 "vc1",
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4126 CODEC_TYPE_VIDEO,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4127 CODEC_ID_VC1,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4128 sizeof(VC1Context),
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4129 vc1_decode_init,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4130 NULL,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4131 vc1_decode_end,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4132 vc1_decode_frame,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4133 CODEC_CAP_DELAY,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4134 NULL
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
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4137 AVCodec wmv3_decoder = {
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4138 "wmv3",
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4139 CODEC_TYPE_VIDEO,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4140 CODEC_ID_WMV3,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4141 sizeof(VC1Context),
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4142 vc1_decode_init,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4143 NULL,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4144 vc1_decode_end,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4145 vc1_decode_frame,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4146 CODEC_CAP_DELAY,
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4147 NULL
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents:
diff changeset
4148 };