annotate rv34.c @ 9473:e38284cd69dc libavcodec

Use memcpy instead of the very inefficient bytecopy where both are correct (i.e. no overlap of src and dst is possible).
author reimar
date Fri, 17 Apr 2009 17:20:48 +0000
parents 54bc8a2727b0
children c9c23894f4ae
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1 /*
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
2 * RV30/40 decoder common data
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
3 * Copyright (c) 2007 Mike Melanson, Konstantin Shishkov
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
4 *
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
5 * This file is part of FFmpeg.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
6 *
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
11 *
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
15 * Lesser General Public License for more details.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
16 *
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
20 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
21
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
22 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8693
diff changeset
23 * @file libavcodec/rv34.c
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
24 * RV30/40 decoder common data
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
25 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
26
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
27 #include "avcodec.h"
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
28 #include "dsputil.h"
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
29 #include "mpegvideo.h"
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
30 #include "golomb.h"
8627
d6bab465b82c moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents: 8504
diff changeset
31 #include "mathops.h"
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
32 #include "rectangle.h"
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
33
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
34 #include "rv34vlc.h"
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
35 #include "rv34data.h"
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
36 #include "rv34.h"
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
37
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
38 //#define DEBUG
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
39
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
40 /** translation of RV30/40 macroblock types to lavc ones */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
41 static const int rv34_mb_type_to_lavc[12] = {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
42 MB_TYPE_INTRA,
8036
9b98b2261938 Mark some of RV3/4 block types as having separate DC subblock
kostya
parents: 6750
diff changeset
43 MB_TYPE_INTRA16x16 | MB_TYPE_SEPARATE_DC,
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
44 MB_TYPE_16x16 | MB_TYPE_L0,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
45 MB_TYPE_8x8 | MB_TYPE_L0,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
46 MB_TYPE_16x16 | MB_TYPE_L0,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
47 MB_TYPE_16x16 | MB_TYPE_L1,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
48 MB_TYPE_SKIP,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
49 MB_TYPE_DIRECT2 | MB_TYPE_16x16,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
50 MB_TYPE_16x8 | MB_TYPE_L0,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
51 MB_TYPE_8x16 | MB_TYPE_L0,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
52 MB_TYPE_16x16 | MB_TYPE_L0L1,
8036
9b98b2261938 Mark some of RV3/4 block types as having separate DC subblock
kostya
parents: 6750
diff changeset
53 MB_TYPE_16x16 | MB_TYPE_L0 | MB_TYPE_SEPARATE_DC
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
54 };
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
55
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
56
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
57 static RV34VLC intra_vlcs[NUM_INTRA_TABLES], inter_vlcs[NUM_INTER_TABLES];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
58
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
59 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
60 * @defgroup vlc RV30/40 VLC generating functions
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
61 * @{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
62 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
63
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
64 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
65 * Generate VLC from codeword lengths.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
66 * @param bits codeword lengths (zeroes are accepted)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
67 * @param size length of input data
8684
ec65d742016f Fix Doxygen comments for RV3/4 decoder.
kostya
parents: 8627
diff changeset
68 * @param vlc output VLC
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
69 * @param insyms symbols for input codes (NULL for default ones)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
70 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
71 static void rv34_gen_vlc(const uint8_t *bits, int size, VLC *vlc, const uint8_t *insyms)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
72 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
73 int i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
74 int counts[17] = {0}, codes[17];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
75 uint16_t cw[size], syms[size];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
76 uint8_t bits2[size];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
77 int maxbits = 0, realsize = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
78
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
79 for(i = 0; i < size; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
80 if(bits[i]){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
81 bits2[realsize] = bits[i];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
82 syms[realsize] = insyms ? insyms[i] : i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
83 realsize++;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
84 maxbits = FFMAX(maxbits, bits[i]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
85 counts[bits[i]]++;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
86 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
87 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
88
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
89 codes[0] = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
90 for(i = 0; i < 16; i++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
91 codes[i+1] = (codes[i] + counts[i]) << 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
92 for(i = 0; i < realsize; i++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
93 cw[i] = codes[bits2[i]]++;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
94
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
95 init_vlc_sparse(vlc, FFMIN(maxbits, 9), realsize,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
96 bits2, 1, 1,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
97 cw, 2, 2,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
98 syms, 2, 2, INIT_VLC_USE_STATIC);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
99 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
100
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
101 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
102 * Initialize all tables.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
103 */
8693
18737839ed27 Add missing void keyword to parameterless function declarations.
diego
parents: 8684
diff changeset
104 static av_cold void rv34_init_tables(void)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
105 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
106 int i, j, k;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
107
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
108 for(i = 0; i < NUM_INTRA_TABLES; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
109 for(j = 0; j < 2; j++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
110 rv34_gen_vlc(rv34_table_intra_cbppat [i][j], CBPPAT_VLC_SIZE, &intra_vlcs[i].cbppattern[j], NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
111 rv34_gen_vlc(rv34_table_intra_secondpat[i][j], OTHERBLK_VLC_SIZE, &intra_vlcs[i].second_pattern[j], NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
112 rv34_gen_vlc(rv34_table_intra_thirdpat [i][j], OTHERBLK_VLC_SIZE, &intra_vlcs[i].third_pattern[j], NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
113 for(k = 0; k < 4; k++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
114 rv34_gen_vlc(rv34_table_intra_cbp[i][j+k*2], CBP_VLC_SIZE, &intra_vlcs[i].cbp[j][k], rv34_cbp_code);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
115 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
116 for(j = 0; j < 4; j++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
117 rv34_gen_vlc(rv34_table_intra_firstpat[i][j], FIRSTBLK_VLC_SIZE, &intra_vlcs[i].first_pattern[j], NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
118 rv34_gen_vlc(rv34_intra_coeff[i], COEFF_VLC_SIZE, &intra_vlcs[i].coefficient, NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
119 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
120
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
121 for(i = 0; i < NUM_INTER_TABLES; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
122 rv34_gen_vlc(rv34_inter_cbppat[i], CBPPAT_VLC_SIZE, &inter_vlcs[i].cbppattern[0], NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
123 for(j = 0; j < 4; j++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
124 rv34_gen_vlc(rv34_inter_cbp[i][j], CBP_VLC_SIZE, &inter_vlcs[i].cbp[0][j], rv34_cbp_code);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
125 for(j = 0; j < 2; j++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
126 rv34_gen_vlc(rv34_table_inter_firstpat [i][j], FIRSTBLK_VLC_SIZE, &inter_vlcs[i].first_pattern[j], NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
127 rv34_gen_vlc(rv34_table_inter_secondpat[i][j], OTHERBLK_VLC_SIZE, &inter_vlcs[i].second_pattern[j], NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
128 rv34_gen_vlc(rv34_table_inter_thirdpat [i][j], OTHERBLK_VLC_SIZE, &inter_vlcs[i].third_pattern[j], NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
129 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
130 rv34_gen_vlc(rv34_inter_coeff[i], COEFF_VLC_SIZE, &inter_vlcs[i].coefficient, NULL);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
131 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
132 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
133
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
134 /** @} */ // vlc group
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
135
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
136
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
137 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
138 * @defgroup transform RV30/40 inverse transform functions
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
139 * @{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
140 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
141
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
142 static av_always_inline void rv34_row_transform(int temp[16], DCTELEM *block)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
143 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
144 int i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
145
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
146 for(i=0; i<4; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
147 const int z0= 13*(block[i+8*0] + block[i+8*2]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
148 const int z1= 13*(block[i+8*0] - block[i+8*2]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
149 const int z2= 7* block[i+8*1] - 17*block[i+8*3];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
150 const int z3= 17* block[i+8*1] + 7*block[i+8*3];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
151
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
152 temp[4*i+0]= z0+z3;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
153 temp[4*i+1]= z1+z2;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
154 temp[4*i+2]= z1-z2;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
155 temp[4*i+3]= z0-z3;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
156 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
157 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
158
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
159 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
160 * Real Video 3.0/4.0 inverse transform
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
161 * Code is almost the same as in SVQ3, only scaling is different.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
162 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
163 static void rv34_inv_transform(DCTELEM *block){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
164 int temp[16];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
165 int i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
166
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
167 rv34_row_transform(temp, block);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
168
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
169 for(i=0; i<4; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
170 const int z0= 13*(temp[4*0+i] + temp[4*2+i]) + 0x200;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
171 const int z1= 13*(temp[4*0+i] - temp[4*2+i]) + 0x200;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
172 const int z2= 7* temp[4*1+i] - 17*temp[4*3+i];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
173 const int z3= 17* temp[4*1+i] + 7*temp[4*3+i];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
174
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
175 block[i*8+0]= (z0 + z3)>>10;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
176 block[i*8+1]= (z1 + z2)>>10;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
177 block[i*8+2]= (z1 - z2)>>10;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
178 block[i*8+3]= (z0 - z3)>>10;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
179 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
180
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
181 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
182
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
183 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
184 * RealVideo 3.0/4.0 inverse transform for DC block
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
185 *
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
186 * Code is almost the same as rv34_inv_transform()
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
187 * but final coefficients are multiplied by 1.5 and have no rounding.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
188 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
189 static void rv34_inv_transform_noround(DCTELEM *block){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
190 int temp[16];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
191 int i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
192
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
193 rv34_row_transform(temp, block);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
194
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
195 for(i=0; i<4; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
196 const int z0= 13*(temp[4*0+i] + temp[4*2+i]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
197 const int z1= 13*(temp[4*0+i] - temp[4*2+i]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
198 const int z2= 7* temp[4*1+i] - 17*temp[4*3+i];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
199 const int z3= 17* temp[4*1+i] + 7*temp[4*3+i];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
200
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
201 block[i*8+0]= ((z0 + z3)*3)>>11;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
202 block[i*8+1]= ((z1 + z2)*3)>>11;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
203 block[i*8+2]= ((z1 - z2)*3)>>11;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
204 block[i*8+3]= ((z0 - z3)*3)>>11;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
205 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
206
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
207 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
208
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
209 /** @} */ // transform
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
210
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
211
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
212 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
213 * @defgroup block RV30/40 4x4 block decoding functions
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
214 * @{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
215 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
216
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
217 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
218 * Decode coded block pattern.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
219 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
220 static int rv34_decode_cbp(GetBitContext *gb, RV34VLC *vlc, int table)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
221 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
222 int pattern, code, cbp=0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
223 int ones;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
224 static const int cbp_masks[3] = {0x100000, 0x010000, 0x110000};
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
225 static const int shifts[4] = { 0, 2, 8, 10 };
8721
42e258f2b931 Silence two pointer assignment compiler warnings in rv34.c
kostya
parents: 8718
diff changeset
226 const int *curshift = shifts;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
227 int i, t, mask;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
228
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
229 code = get_vlc2(gb, vlc->cbppattern[table].table, 9, 2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
230 pattern = code & 0xF;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
231 code >>= 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
232
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
233 ones = rv34_count_ones[pattern];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
234
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
235 for(mask = 8; mask; mask >>= 1, curshift++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
236 if(pattern & mask)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
237 cbp |= get_vlc2(gb, vlc->cbp[table][ones].table, vlc->cbp[table][ones].bits, 1) << curshift[0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
238 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
239
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
240 for(i = 0; i < 4; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
241 t = modulo_three_table[code][i];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
242 if(t == 1)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
243 cbp |= cbp_masks[get_bits1(gb)] << i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
244 if(t == 2)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
245 cbp |= cbp_masks[2] << i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
246 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
247 return cbp;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
248 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
249
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
250 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
251 * Get one coefficient value from the bistream and store it.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
252 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
253 static inline void decode_coeff(DCTELEM *dst, int coef, int esc, GetBitContext *gb, VLC* vlc)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
254 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
255 if(coef){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
256 if(coef == esc){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
257 coef = get_vlc2(gb, vlc->table, 9, 2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
258 if(coef > 23){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
259 coef -= 23;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
260 coef = 22 + ((1 << coef) | get_bits(gb, coef));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
261 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
262 coef += esc;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
263 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
264 if(get_bits1(gb))
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
265 coef = -coef;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
266 *dst = coef;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
267 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
268 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
269
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
270 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
271 * Decode 2x2 subblock of coefficients.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
272 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
273 static inline void decode_subblock(DCTELEM *dst, int code, const int is_block2, GetBitContext *gb, VLC *vlc)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
274 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
275 int coeffs[4];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
276
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
277 coeffs[0] = modulo_three_table[code][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
278 coeffs[1] = modulo_three_table[code][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
279 coeffs[2] = modulo_three_table[code][2];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
280 coeffs[3] = modulo_three_table[code][3];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
281 decode_coeff(dst , coeffs[0], 3, gb, vlc);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
282 if(is_block2){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
283 decode_coeff(dst+8, coeffs[1], 2, gb, vlc);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
284 decode_coeff(dst+1, coeffs[2], 2, gb, vlc);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
285 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
286 decode_coeff(dst+1, coeffs[1], 2, gb, vlc);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
287 decode_coeff(dst+8, coeffs[2], 2, gb, vlc);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
288 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
289 decode_coeff(dst+9, coeffs[3], 2, gb, vlc);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
290 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
291
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
292 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
293 * Decode coefficients for 4x4 block.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
294 *
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
295 * This is done by filling 2x2 subblocks with decoded coefficients
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
296 * in this order (the same for subblocks and subblock coefficients):
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
297 * o--o
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
298 * /
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
299 * /
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
300 * o--o
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
301 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
302
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
303 static inline void rv34_decode_block(DCTELEM *dst, GetBitContext *gb, RV34VLC *rvlc, int fc, int sc)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
304 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
305 int code, pattern;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
306
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
307 code = get_vlc2(gb, rvlc->first_pattern[fc].table, 9, 2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
308
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
309 pattern = code & 0x7;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
310
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
311 code >>= 3;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
312 decode_subblock(dst, code, 0, gb, &rvlc->coefficient);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
313
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
314 if(pattern & 4){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
315 code = get_vlc2(gb, rvlc->second_pattern[sc].table, 9, 2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
316 decode_subblock(dst + 2, code, 0, gb, &rvlc->coefficient);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
317 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
318 if(pattern & 2){ // Looks like coefficients 1 and 2 are swapped for this block
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
319 code = get_vlc2(gb, rvlc->second_pattern[sc].table, 9, 2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
320 decode_subblock(dst + 8*2, code, 1, gb, &rvlc->coefficient);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
321 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
322 if(pattern & 1){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
323 code = get_vlc2(gb, rvlc->third_pattern[sc].table, 9, 2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
324 decode_subblock(dst + 8*2+2, code, 0, gb, &rvlc->coefficient);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
325 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
326
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
327 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
328
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
329 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
330 * Dequantize ordinary 4x4 block.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
331 * @todo optimize
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
332 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
333 static inline void rv34_dequant4x4(DCTELEM *block, int Qdc, int Q)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
334 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
335 int i, j;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
336
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
337 block[0] = (block[0] * Qdc + 8) >> 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
338 for(i = 0; i < 4; i++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
339 for(j = !i; j < 4; j++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
340 block[j + i*8] = (block[j + i*8] * Q + 8) >> 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
341 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
342
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
343 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
344 * Dequantize 4x4 block of DC values for 16x16 macroblock.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
345 * @todo optimize
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
346 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
347 static inline void rv34_dequant4x4_16x16(DCTELEM *block, int Qdc, int Q)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
348 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
349 int i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
350
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
351 for(i = 0; i < 3; i++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
352 block[rv34_dezigzag[i]] = (block[rv34_dezigzag[i]] * Qdc + 8) >> 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
353 for(; i < 16; i++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
354 block[rv34_dezigzag[i]] = (block[rv34_dezigzag[i]] * Q + 8) >> 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
355 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
356 /** @} */ //block functions
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
357
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
358
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
359 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
360 * @defgroup bitstream RV30/40 bitstream parsing
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
361 * @{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
362 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
363
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
364 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
365 * Decode starting slice position.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
366 * @todo Maybe replace with ff_h263_decode_mba() ?
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
367 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
368 int ff_rv34_get_start_offset(GetBitContext *gb, int mb_size)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
369 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
370 int i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
371 for(i = 0; i < 5; i++)
8445
8621deaff8dc 352l: correct calculating number of bits for storing macroblock offset in RV3/4
kostya
parents: 8371
diff changeset
372 if(rv34_mb_max_sizes[i] >= mb_size - 1)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
373 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
374 return rv34_mb_bits_sizes[i];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
375 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
376
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
377 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
378 * Select VLC set for decoding from current quantizer, modifier and frame type.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
379 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
380 static inline RV34VLC* choose_vlc_set(int quant, int mod, int type)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
381 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
382 if(mod == 2 && quant < 19) quant += 10;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
383 else if(mod && quant < 26) quant += 5;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
384 return type ? &inter_vlcs[rv34_quant_to_vlc_set[1][av_clip(quant, 0, 30)]]
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
385 : &intra_vlcs[rv34_quant_to_vlc_set[0][av_clip(quant, 0, 30)]];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
386 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
387
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
388 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
389 * Decode quantizer difference and return modified quantizer.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
390 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
391 static inline int rv34_decode_dquant(GetBitContext *gb, int quant)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
392 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
393 if(get_bits1(gb))
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
394 return rv34_dquant_tab[get_bits1(gb)][quant];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
395 else
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
396 return get_bits(gb, 5);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
397 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
398
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
399 /** @} */ //bitstream functions
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
400
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
401 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
402 * @defgroup mv motion vector related code (prediction, reconstruction, motion compensation)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
403 * @{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
404 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
405
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
406 /** macroblock partition width in 8x8 blocks */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
407 static const uint8_t part_sizes_w[RV34_MB_TYPES] = { 2, 2, 2, 1, 2, 2, 2, 2, 2, 1, 2, 2 };
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
408
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
409 /** macroblock partition height in 8x8 blocks */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
410 static const uint8_t part_sizes_h[RV34_MB_TYPES] = { 2, 2, 2, 1, 2, 2, 2, 2, 1, 2, 2, 2 };
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
411
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
412 /** availability index for subblocks */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
413 static const uint8_t avail_indexes[4] = { 5, 6, 9, 10 };
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
414
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
415 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
416 * motion vector prediction
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
417 *
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
418 * Motion prediction performed for the block by using median prediction of
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
419 * motion vectors from the left, top and right top blocks but in corner cases
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
420 * some other vectors may be used instead.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
421 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
422 static void rv34_pred_mv(RV34DecContext *r, int block_type, int subblock_no, int dmv_no)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
423 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
424 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
425 int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
426 int A[2] = {0}, B[2], C[2];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
427 int i, j;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
428 int mx, my;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
429 int avail_index = avail_indexes[subblock_no];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
430 int c_off = part_sizes_w[block_type];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
431
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
432 mv_pos += (subblock_no & 1) + (subblock_no >> 1)*s->b8_stride;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
433 if(subblock_no == 3)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
434 c_off = -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
435
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
436 if(r->avail_cache[avail_index - 1]){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
437 A[0] = s->current_picture_ptr->motion_val[0][mv_pos-1][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
438 A[1] = s->current_picture_ptr->motion_val[0][mv_pos-1][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
439 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
440 if(r->avail_cache[avail_index - 4]){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
441 B[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
442 B[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
443 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
444 B[0] = A[0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
445 B[1] = A[1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
446 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
447 if(!r->avail_cache[avail_index - 4 + c_off]){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
448 if(r->avail_cache[avail_index - 4] && (r->avail_cache[avail_index - 1] || r->rv30)){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
449 C[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride-1][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
450 C[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride-1][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
451 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
452 C[0] = A[0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
453 C[1] = A[1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
454 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
455 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
456 C[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride+c_off][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
457 C[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride+c_off][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
458 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
459 mx = mid_pred(A[0], B[0], C[0]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
460 my = mid_pred(A[1], B[1], C[1]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
461 mx += r->dmv[dmv_no][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
462 my += r->dmv[dmv_no][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
463 for(j = 0; j < part_sizes_h[block_type]; j++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
464 for(i = 0; i < part_sizes_w[block_type]; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
465 s->current_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][0] = mx;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
466 s->current_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][1] = my;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
467 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
468 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
469 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
470
6714
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
471 #define GET_PTS_DIFF(a, b) ((a - b + 8192) & 0x1FFF)
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
472
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
473 /**
6096
89140b93ae09 Direct blocks should use motion vectors from the second reference frame
kostya
parents: 6036
diff changeset
474 * Calculate motion vector component that should be added for direct blocks.
89140b93ae09 Direct blocks should use motion vectors from the second reference frame
kostya
parents: 6036
diff changeset
475 */
6714
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
476 static int calc_add_mv(RV34DecContext *r, int dir, int val)
6096
89140b93ae09 Direct blocks should use motion vectors from the second reference frame
kostya
parents: 6036
diff changeset
477 {
6714
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
478 int refdist = GET_PTS_DIFF(r->next_pts, r->last_pts);
8086
ae146e429003 Correct motion vector scaling in B-frames for RV3/4
kostya
parents: 8074
diff changeset
479 int dist = dir ? -GET_PTS_DIFF(r->next_pts, r->cur_pts) : GET_PTS_DIFF(r->cur_pts, r->last_pts);
ae146e429003 Correct motion vector scaling in B-frames for RV3/4
kostya
parents: 8074
diff changeset
480 int mul;
6096
89140b93ae09 Direct blocks should use motion vectors from the second reference frame
kostya
parents: 6036
diff changeset
481
6714
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
482 if(!refdist) return 0;
8086
ae146e429003 Correct motion vector scaling in B-frames for RV3/4
kostya
parents: 8074
diff changeset
483 mul = (dist << 14) / refdist;
ae146e429003 Correct motion vector scaling in B-frames for RV3/4
kostya
parents: 8074
diff changeset
484 return (val * mul + 0x2000) >> 14;
6096
89140b93ae09 Direct blocks should use motion vectors from the second reference frame
kostya
parents: 6036
diff changeset
485 }
89140b93ae09 Direct blocks should use motion vectors from the second reference frame
kostya
parents: 6036
diff changeset
486
89140b93ae09 Direct blocks should use motion vectors from the second reference frame
kostya
parents: 6036
diff changeset
487 /**
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
488 * Predict motion vector for B-frame macroblock.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
489 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
490 static inline void rv34_pred_b_vector(int A[2], int B[2], int C[2],
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
491 int A_avail, int B_avail, int C_avail,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
492 int *mx, int *my)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
493 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
494 if(A_avail + B_avail + C_avail != 3){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
495 *mx = A[0] + B[0] + C[0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
496 *my = A[1] + B[1] + C[1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
497 if(A_avail + B_avail + C_avail == 2){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
498 *mx /= 2;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
499 *my /= 2;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
500 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
501 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
502 *mx = mid_pred(A[0], B[0], C[0]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
503 *my = mid_pred(A[1], B[1], C[1]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
504 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
505 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
506
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
507 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
508 * motion vector prediction for B-frames
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
509 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
510 static void rv34_pred_mv_b(RV34DecContext *r, int block_type, int dir)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
511 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
512 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
513 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
514 int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
515 int A[2], B[2], C[2];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
516 int has_A = 0, has_B = 0, has_C = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
517 int mx, my;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
518 int i, j;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
519 Picture *cur_pic = s->current_picture_ptr;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
520 const int mask = dir ? MB_TYPE_L1 : MB_TYPE_L0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
521 int type = cur_pic->mb_type[mb_pos];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
522
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
523 memset(A, 0, sizeof(A));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
524 memset(B, 0, sizeof(B));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
525 memset(C, 0, sizeof(C));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
526 if((r->avail_cache[5-1] & type) & mask){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
527 A[0] = cur_pic->motion_val[dir][mv_pos - 1][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
528 A[1] = cur_pic->motion_val[dir][mv_pos - 1][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
529 has_A = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
530 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
531 if((r->avail_cache[5-4] & type) & mask){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
532 B[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
533 B[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
534 has_B = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
535 }
9168
5de43b1eb9f4 Correct MV prediction for B-frame blocks in RV4 decoder
kostya
parents: 9162
diff changeset
536 if(r->avail_cache[5-4] && (r->avail_cache[5-2] & type) & mask){
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
537 C[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride + 2][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
538 C[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride + 2][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
539 has_C = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
540 }else if((s->mb_x+1) == s->mb_width && (r->avail_cache[5-5] & type) & mask){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
541 C[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride - 1][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
542 C[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride - 1][1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
543 has_C = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
544 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
545
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
546 rv34_pred_b_vector(A, B, C, has_A, has_B, has_C, &mx, &my);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
547
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
548 mx += r->dmv[dir][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
549 my += r->dmv[dir][1];
6096
89140b93ae09 Direct blocks should use motion vectors from the second reference frame
kostya
parents: 6036
diff changeset
550
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
551 for(j = 0; j < 2; j++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
552 for(i = 0; i < 2; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
553 cur_pic->motion_val[dir][mv_pos + i + j*s->b8_stride][0] = mx;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
554 cur_pic->motion_val[dir][mv_pos + i + j*s->b8_stride][1] = my;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
555 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
556 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
557 if(block_type == RV34_MB_B_BACKWARD || block_type == RV34_MB_B_FORWARD)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
558 fill_rectangle(cur_pic->motion_val[!dir][mv_pos], 2, 2, s->b8_stride, 0, 4);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
559 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
560
8099
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
561 /**
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
562 * motion vector prediction - RV3 version
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
563 */
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
564 static void rv34_pred_mv_rv3(RV34DecContext *r, int block_type, int dir)
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
565 {
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
566 MpegEncContext *s = &r->s;
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
567 int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
568 int A[2] = {0}, B[2], C[2];
8504
3bfb7a2ea222 It turned out that RV30 uses motion vectors for forward motion B-frame
kostya
parents: 8445
diff changeset
569 int i, j, k;
8099
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
570 int mx, my;
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
571 int avail_index = avail_indexes[0];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
572
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
573 if(r->avail_cache[avail_index - 1]){
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
574 A[0] = s->current_picture_ptr->motion_val[0][mv_pos-1][0];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
575 A[1] = s->current_picture_ptr->motion_val[0][mv_pos-1][1];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
576 }
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
577 if(r->avail_cache[avail_index - 4]){
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
578 B[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride][0];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
579 B[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride][1];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
580 }else{
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
581 B[0] = A[0];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
582 B[1] = A[1];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
583 }
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
584 if(!r->avail_cache[avail_index - 4 + 2]){
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
585 if(r->avail_cache[avail_index - 4] && (r->avail_cache[avail_index - 1])){
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
586 C[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride-1][0];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
587 C[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride-1][1];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
588 }else{
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
589 C[0] = A[0];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
590 C[1] = A[1];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
591 }
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
592 }else{
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
593 C[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride+2][0];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
594 C[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride+2][1];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
595 }
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
596 mx = mid_pred(A[0], B[0], C[0]);
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
597 my = mid_pred(A[1], B[1], C[1]);
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
598 mx += r->dmv[0][0];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
599 my += r->dmv[0][1];
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
600 for(j = 0; j < 2; j++){
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
601 for(i = 0; i < 2; i++){
8504
3bfb7a2ea222 It turned out that RV30 uses motion vectors for forward motion B-frame
kostya
parents: 8445
diff changeset
602 for(k = 0; k < 2; k++){
3bfb7a2ea222 It turned out that RV30 uses motion vectors for forward motion B-frame
kostya
parents: 8445
diff changeset
603 s->current_picture_ptr->motion_val[k][mv_pos + i + j*s->b8_stride][0] = mx;
3bfb7a2ea222 It turned out that RV30 uses motion vectors for forward motion B-frame
kostya
parents: 8445
diff changeset
604 s->current_picture_ptr->motion_val[k][mv_pos + i + j*s->b8_stride][1] = my;
3bfb7a2ea222 It turned out that RV30 uses motion vectors for forward motion B-frame
kostya
parents: 8445
diff changeset
605 }
8099
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
606 }
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
607 }
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
608 }
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
609
8074
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
610 static const int chroma_coeffs[3] = { 0, 3, 5 };
6106
7185e3bb0614 RV30 thirdpel motion compensation support
kostya
parents: 6099
diff changeset
611
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
612 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
613 * generic motion compensation function
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
614 *
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
615 * @param r decoder context
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
616 * @param block_type type of the current block
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
617 * @param xoff horizontal offset from the start of the current block
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
618 * @param yoff vertical offset from the start of the current block
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
619 * @param mv_off offset to the motion vector information
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
620 * @param width width of the current partition in 8x8 blocks
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
621 * @param height height of the current partition in 8x8 blocks
8684
ec65d742016f Fix Doxygen comments for RV3/4 decoder.
kostya
parents: 8627
diff changeset
622 * @param dir motion compensation direction (i.e. from the last or the next reference frame)
ec65d742016f Fix Doxygen comments for RV3/4 decoder.
kostya
parents: 8627
diff changeset
623 * @param thirdpel motion vectors are specified in 1/3 of pixel
ec65d742016f Fix Doxygen comments for RV3/4 decoder.
kostya
parents: 8627
diff changeset
624 * @param qpel_mc a set of functions used to perform luma motion compensation
ec65d742016f Fix Doxygen comments for RV3/4 decoder.
kostya
parents: 8627
diff changeset
625 * @param chroma_mc a set of functions used to perform chroma motion compensation
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
626 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
627 static inline void rv34_mc(RV34DecContext *r, const int block_type,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
628 const int xoff, const int yoff, int mv_off,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
629 const int width, const int height, int dir,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
630 const int thirdpel,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
631 qpel_mc_func (*qpel_mc)[16],
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
632 h264_chroma_mc_func (*chroma_mc))
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
633 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
634 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
635 uint8_t *Y, *U, *V, *srcY, *srcU, *srcV;
8074
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
636 int dxy, mx, my, umx, umy, lx, ly, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
637 int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride + mv_off;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
638 int is16x16 = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
639
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
640 if(thirdpel){
8074
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
641 int chroma_mx, chroma_my;
6106
7185e3bb0614 RV30 thirdpel motion compensation support
kostya
parents: 6099
diff changeset
642 mx = (s->current_picture_ptr->motion_val[dir][mv_pos][0] + (3 << 24)) / 3 - (1 << 24);
7185e3bb0614 RV30 thirdpel motion compensation support
kostya
parents: 6099
diff changeset
643 my = (s->current_picture_ptr->motion_val[dir][mv_pos][1] + (3 << 24)) / 3 - (1 << 24);
7185e3bb0614 RV30 thirdpel motion compensation support
kostya
parents: 6099
diff changeset
644 lx = (s->current_picture_ptr->motion_val[dir][mv_pos][0] + (3 << 24)) % 3;
7185e3bb0614 RV30 thirdpel motion compensation support
kostya
parents: 6099
diff changeset
645 ly = (s->current_picture_ptr->motion_val[dir][mv_pos][1] + (3 << 24)) % 3;
8074
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
646 chroma_mx = (s->current_picture_ptr->motion_val[dir][mv_pos][0] + 1) >> 1;
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
647 chroma_my = (s->current_picture_ptr->motion_val[dir][mv_pos][1] + 1) >> 1;
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
648 umx = (chroma_mx + (3 << 24)) / 3 - (1 << 24);
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
649 umy = (chroma_my + (3 << 24)) / 3 - (1 << 24);
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
650 uvmx = chroma_coeffs[(chroma_mx + (3 << 24)) % 3];
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
651 uvmy = chroma_coeffs[(chroma_my + (3 << 24)) % 3];
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
652 }else{
8221
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
653 int cx, cy;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
654 mx = s->current_picture_ptr->motion_val[dir][mv_pos][0] >> 2;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
655 my = s->current_picture_ptr->motion_val[dir][mv_pos][1] >> 2;
6121
bc59962f70b9 Fractional parts of motion vectors should be accounted separately too
kostya
parents: 6106
diff changeset
656 lx = s->current_picture_ptr->motion_val[dir][mv_pos][0] & 3;
bc59962f70b9 Fractional parts of motion vectors should be accounted separately too
kostya
parents: 6106
diff changeset
657 ly = s->current_picture_ptr->motion_val[dir][mv_pos][1] & 3;
8221
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
658 cx = s->current_picture_ptr->motion_val[dir][mv_pos][0] / 2;
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
659 cy = s->current_picture_ptr->motion_val[dir][mv_pos][1] / 2;
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
660 umx = cx >> 2;
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
661 umy = cy >> 2;
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
662 uvmx = (cx & 3) << 1;
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
663 uvmy = (cy & 3) << 1;
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
664 //due to some flaw RV40 uses the same MC compensation routine for H2V2 and H3V3
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
665 if(uvmx == 6 && uvmy == 6)
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
666 uvmx = uvmy = 4;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
667 }
6121
bc59962f70b9 Fractional parts of motion vectors should be accounted separately too
kostya
parents: 6106
diff changeset
668 dxy = ly*4 + lx;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
669 srcY = dir ? s->next_picture_ptr->data[0] : s->last_picture_ptr->data[0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
670 srcU = dir ? s->next_picture_ptr->data[1] : s->last_picture_ptr->data[1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
671 srcV = dir ? s->next_picture_ptr->data[2] : s->last_picture_ptr->data[2];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
672 src_x = s->mb_x * 16 + xoff + mx;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
673 src_y = s->mb_y * 16 + yoff + my;
8074
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
674 uvsrc_x = s->mb_x * 8 + (xoff >> 1) + umx;
31e90d4abe28 Fix chroma motion compensation for RV30
kostya
parents: 8046
diff changeset
675 uvsrc_y = s->mb_y * 8 + (yoff >> 1) + umy;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
676 srcY += src_y * s->linesize + src_x;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
677 srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
678 srcV += uvsrc_y * s->uvlinesize + uvsrc_x;
8179
883feb4edb65 Use wider margins for edge emulation in RV30/40
kostya
parents: 8128
diff changeset
679 if( (unsigned)(src_x - !!lx*2) > s->h_edge_pos - !!lx*2 - (width <<3) - 4
883feb4edb65 Use wider margins for edge emulation in RV30/40
kostya
parents: 8128
diff changeset
680 || (unsigned)(src_y - !!ly*2) > s->v_edge_pos - !!ly*2 - (height<<3) - 4){
883feb4edb65 Use wider margins for edge emulation in RV30/40
kostya
parents: 8128
diff changeset
681 uint8_t *uvbuf= s->edge_emu_buffer + 22 * s->linesize;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
682
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
683 srcY -= 2 + 2*s->linesize;
8179
883feb4edb65 Use wider margins for edge emulation in RV30/40
kostya
parents: 8128
diff changeset
684 ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, (width<<3)+6, (height<<3)+6,
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
685 src_x - 2, src_y - 2, s->h_edge_pos, s->v_edge_pos);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
686 srcY = s->edge_emu_buffer + 2 + 2*s->linesize;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
687 ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, (width<<2)+1, (height<<2)+1,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
688 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
689 ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, (width<<2)+1, (height<<2)+1,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
690 uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
691 srcU = uvbuf;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
692 srcV = uvbuf + 16;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
693 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
694 Y = s->dest[0] + xoff + yoff *s->linesize;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
695 U = s->dest[1] + (xoff>>1) + (yoff>>1)*s->uvlinesize;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
696 V = s->dest[2] + (xoff>>1) + (yoff>>1)*s->uvlinesize;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
697
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
698 if(block_type == RV34_MB_P_16x8){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
699 qpel_mc[1][dxy](Y, srcY, s->linesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
700 Y += 8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
701 srcY += 8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
702 }else if(block_type == RV34_MB_P_8x16){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
703 qpel_mc[1][dxy](Y, srcY, s->linesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
704 Y += 8 * s->linesize;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
705 srcY += 8 * s->linesize;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
706 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
707 is16x16 = (block_type != RV34_MB_P_8x8) && (block_type != RV34_MB_P_16x8) && (block_type != RV34_MB_P_8x16);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
708 qpel_mc[!is16x16][dxy](Y, srcY, s->linesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
709 chroma_mc[2-width] (U, srcU, s->uvlinesize, height*4, uvmx, uvmy);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
710 chroma_mc[2-width] (V, srcV, s->uvlinesize, height*4, uvmx, uvmy);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
711 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
712
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
713 static void rv34_mc_1mv(RV34DecContext *r, const int block_type,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
714 const int xoff, const int yoff, int mv_off,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
715 const int width, const int height, int dir)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
716 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
717 rv34_mc(r, block_type, xoff, yoff, mv_off, width, height, dir, r->rv30,
6106
7185e3bb0614 RV30 thirdpel motion compensation support
kostya
parents: 6099
diff changeset
718 r->rv30 ? r->s.dsp.put_rv30_tpel_pixels_tab
8221
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
719 : r->s.dsp.put_rv40_qpel_pixels_tab,
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
720 r->rv30 ? r->s.dsp.put_h264_chroma_pixels_tab
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
721 : r->s.dsp.put_rv40_chroma_pixels_tab);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
722 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
723
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
724 static void rv34_mc_2mv(RV34DecContext *r, const int block_type)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
725 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
726 rv34_mc(r, block_type, 0, 0, 0, 2, 2, 0, r->rv30,
6106
7185e3bb0614 RV30 thirdpel motion compensation support
kostya
parents: 6099
diff changeset
727 r->rv30 ? r->s.dsp.put_rv30_tpel_pixels_tab
8221
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
728 : r->s.dsp.put_rv40_qpel_pixels_tab,
8244
3f3d653fb46d 34l: forgot to change one case of chroma MC for RV40
kostya
parents: 8243
diff changeset
729 r->rv30 ? r->s.dsp.put_h264_chroma_pixels_tab
3f3d653fb46d 34l: forgot to change one case of chroma MC for RV40
kostya
parents: 8243
diff changeset
730 : r->s.dsp.put_rv40_chroma_pixels_tab);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
731 rv34_mc(r, block_type, 0, 0, 0, 2, 2, 1, r->rv30,
6106
7185e3bb0614 RV30 thirdpel motion compensation support
kostya
parents: 6099
diff changeset
732 r->rv30 ? r->s.dsp.avg_rv30_tpel_pixels_tab
8221
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
733 : r->s.dsp.avg_rv40_qpel_pixels_tab,
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
734 r->rv30 ? r->s.dsp.avg_h264_chroma_pixels_tab
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
735 : r->s.dsp.avg_rv40_chroma_pixels_tab);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
736 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
737
6693
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
738 static void rv34_mc_2mv_skip(RV34DecContext *r)
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
739 {
8128
e2241dd85c65 Remove unused variable.
diego
parents: 8122
diff changeset
740 int i, j;
6693
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
741 for(j = 0; j < 2; j++)
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
742 for(i = 0; i < 2; i++){
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
743 rv34_mc(r, RV34_MB_P_8x8, i*8, j*8, i+j*r->s.b8_stride, 1, 1, 0, r->rv30,
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
744 r->rv30 ? r->s.dsp.put_rv30_tpel_pixels_tab
8221
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
745 : r->s.dsp.put_rv40_qpel_pixels_tab,
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
746 r->rv30 ? r->s.dsp.put_h264_chroma_pixels_tab
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
747 : r->s.dsp.put_rv40_chroma_pixels_tab);
6693
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
748 rv34_mc(r, RV34_MB_P_8x8, i*8, j*8, i+j*r->s.b8_stride, 1, 1, 1, r->rv30,
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
749 r->rv30 ? r->s.dsp.avg_rv30_tpel_pixels_tab
8221
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
750 : r->s.dsp.avg_rv40_qpel_pixels_tab,
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
751 r->rv30 ? r->s.dsp.avg_h264_chroma_pixels_tab
466100c8e27b Fix RV40 chroma MC
kostya
parents: 8181
diff changeset
752 : r->s.dsp.avg_rv40_chroma_pixels_tab);
6693
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
753 }
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
754 }
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
755
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
756 /** number of motion vectors in each macroblock type */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
757 static const int num_mvs[RV34_MB_TYPES] = { 0, 0, 1, 4, 1, 1, 0, 0, 2, 2, 2, 1 };
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
758
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
759 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
760 * Decode motion vector differences
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
761 * and perform motion vector reconstruction and motion compensation.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
762 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
763 static int rv34_decode_mv(RV34DecContext *r, int block_type)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
764 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
765 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
766 GetBitContext *gb = &s->gb;
6714
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
767 int i, j, k, l;
6693
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
768 int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
769 int next_bt;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
770
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
771 memset(r->dmv, 0, sizeof(r->dmv));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
772 for(i = 0; i < num_mvs[block_type]; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
773 r->dmv[i][0] = svq3_get_se_golomb(gb);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
774 r->dmv[i][1] = svq3_get_se_golomb(gb);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
775 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
776 switch(block_type){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
777 case RV34_MB_TYPE_INTRA:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
778 case RV34_MB_TYPE_INTRA16x16:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
779 fill_rectangle(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], 2, 2, s->b8_stride, 0, 4);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
780 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
781 case RV34_MB_SKIP:
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6156
diff changeset
782 if(s->pict_type == FF_P_TYPE){
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
783 fill_rectangle(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], 2, 2, s->b8_stride, 0, 4);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
784 rv34_mc_1mv (r, block_type, 0, 0, 0, 2, 2, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
785 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
786 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
787 case RV34_MB_B_DIRECT:
6693
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
788 //surprisingly, it uses motion scheme from next reference frame
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
789 next_bt = s->next_picture_ptr->mb_type[s->mb_x + s->mb_y * s->mb_stride];
9162
9f96409c5134 Fix direct and skip MB motion compensation in RV4:
kostya
parents: 9041
diff changeset
790 if(IS_INTRA(next_bt) || IS_SKIP(next_bt)){
9040
71620eeff338 Since motion vectors for intra blocks are always zero, do not try to retrieve them.
kostya
parents: 8827
diff changeset
791 fill_rectangle(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], 2, 2, s->b8_stride, 0, 4);
9162
9f96409c5134 Fix direct and skip MB motion compensation in RV4:
kostya
parents: 9041
diff changeset
792 fill_rectangle(s->current_picture_ptr->motion_val[1][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], 2, 2, s->b8_stride, 0, 4);
9f96409c5134 Fix direct and skip MB motion compensation in RV4:
kostya
parents: 9041
diff changeset
793 }else
9041
05e82eb11983 cosmetics: reindent after last commit
kostya
parents: 9040
diff changeset
794 for(j = 0; j < 2; j++)
05e82eb11983 cosmetics: reindent after last commit
kostya
parents: 9040
diff changeset
795 for(i = 0; i < 2; i++)
05e82eb11983 cosmetics: reindent after last commit
kostya
parents: 9040
diff changeset
796 for(k = 0; k < 2; k++)
05e82eb11983 cosmetics: reindent after last commit
kostya
parents: 9040
diff changeset
797 for(l = 0; l < 2; l++)
05e82eb11983 cosmetics: reindent after last commit
kostya
parents: 9040
diff changeset
798 s->current_picture_ptr->motion_val[l][mv_pos + i + j*s->b8_stride][k] = calc_add_mv(r, l, s->next_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][k]);
9162
9f96409c5134 Fix direct and skip MB motion compensation in RV4:
kostya
parents: 9041
diff changeset
799 if(!(IS_16X8(next_bt) || IS_8X16(next_bt) || IS_8X8(next_bt))) //we can use whole macroblock MC
6693
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
800 rv34_mc_2mv(r, block_type);
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
801 else
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
802 rv34_mc_2mv_skip(r);
6f13852a9161 Skip blocks in B-frames reuse motion vectors from next reference frame.
kostya
parents: 6517
diff changeset
803 fill_rectangle(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], 2, 2, s->b8_stride, 0, 4);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
804 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
805 case RV34_MB_P_16x16:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
806 case RV34_MB_P_MIX16x16:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
807 rv34_pred_mv(r, block_type, 0, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
808 rv34_mc_1mv (r, block_type, 0, 0, 0, 2, 2, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
809 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
810 case RV34_MB_B_FORWARD:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
811 case RV34_MB_B_BACKWARD:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
812 r->dmv[1][0] = r->dmv[0][0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
813 r->dmv[1][1] = r->dmv[0][1];
8099
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
814 if(r->rv30)
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
815 rv34_pred_mv_rv3(r, block_type, block_type == RV34_MB_B_BACKWARD);
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
816 else
bc786a34f6eb Introduce RV3-specific motion vector prediction.
kostya
parents: 8086
diff changeset
817 rv34_pred_mv_b (r, block_type, block_type == RV34_MB_B_BACKWARD);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
818 rv34_mc_1mv (r, block_type, 0, 0, 0, 2, 2, block_type == RV34_MB_B_BACKWARD);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
819 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
820 case RV34_MB_P_16x8:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
821 case RV34_MB_P_8x16:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
822 rv34_pred_mv(r, block_type, 0, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
823 rv34_pred_mv(r, block_type, 1 + (block_type == RV34_MB_P_16x8), 1);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
824 if(block_type == RV34_MB_P_16x8){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
825 rv34_mc_1mv(r, block_type, 0, 0, 0, 2, 1, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
826 rv34_mc_1mv(r, block_type, 0, 8, s->b8_stride, 2, 1, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
827 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
828 if(block_type == RV34_MB_P_8x16){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
829 rv34_mc_1mv(r, block_type, 0, 0, 0, 1, 2, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
830 rv34_mc_1mv(r, block_type, 8, 0, 1, 1, 2, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
831 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
832 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
833 case RV34_MB_B_BIDIR:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
834 rv34_pred_mv_b (r, block_type, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
835 rv34_pred_mv_b (r, block_type, 1);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
836 rv34_mc_2mv (r, block_type);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
837 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
838 case RV34_MB_P_8x8:
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
839 for(i=0;i< 4;i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
840 rv34_pred_mv(r, block_type, i, i);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
841 rv34_mc_1mv (r, block_type, (i&1)<<3, (i&2)<<2, (i&1)+(i>>1)*s->b8_stride, 1, 1, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
842 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
843 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
844 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
845
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
846 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
847 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
848 /** @} */ // mv group
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
849
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
850 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
851 * @defgroup recons Macroblock reconstruction functions
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
852 * @{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
853 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
854 /** mapping of RV30/40 intra prediction types to standard H.264 types */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
855 static const int ittrans[9] = {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
856 DC_PRED, VERT_PRED, HOR_PRED, DIAG_DOWN_RIGHT_PRED, DIAG_DOWN_LEFT_PRED,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
857 VERT_RIGHT_PRED, VERT_LEFT_PRED, HOR_UP_PRED, HOR_DOWN_PRED,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
858 };
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
859
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
860 /** mapping of RV30/40 intra 16x16 prediction types to standard H.264 types */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
861 static const int ittrans16[4] = {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
862 DC_PRED8x8, VERT_PRED8x8, HOR_PRED8x8, PLANE_PRED8x8,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
863 };
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
864
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
865 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
866 * Perform 4x4 intra prediction.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
867 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
868 static void rv34_pred_4x4_block(RV34DecContext *r, uint8_t *dst, int stride, int itype, int up, int left, int down, int right)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
869 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
870 uint8_t *prev = dst - stride + 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
871 uint32_t topleft;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
872
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
873 if(!up && !left)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
874 itype = DC_128_PRED;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
875 else if(!up){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
876 if(itype == VERT_PRED) itype = HOR_PRED;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
877 if(itype == DC_PRED) itype = LEFT_DC_PRED;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
878 }else if(!left){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
879 if(itype == HOR_PRED) itype = VERT_PRED;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
880 if(itype == DC_PRED) itype = TOP_DC_PRED;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
881 if(itype == DIAG_DOWN_LEFT_PRED) itype = DIAG_DOWN_LEFT_PRED_RV40_NODOWN;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
882 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
883 if(!down){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
884 if(itype == DIAG_DOWN_LEFT_PRED) itype = DIAG_DOWN_LEFT_PRED_RV40_NODOWN;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
885 if(itype == HOR_UP_PRED) itype = HOR_UP_PRED_RV40_NODOWN;
6036
ce3b68242317 Correct spatial prediction mode in RV30/40 for vertical left direction
kostya
parents: 6026
diff changeset
886 if(itype == VERT_LEFT_PRED) itype = VERT_LEFT_PRED_RV40_NODOWN;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
887 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
888 if(!right && up){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
889 topleft = dst[-stride + 3] * 0x01010101;
8721
42e258f2b931 Silence two pointer assignment compiler warnings in rv34.c
kostya
parents: 8718
diff changeset
890 prev = (uint8_t*)&topleft;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
891 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
892 r->h.pred4x4[itype](dst, prev, stride);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
893 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
894
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
895 /** add_pixels_clamped for 4x4 block */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
896 static void rv34_add_4x4_block(uint8_t *dst, int stride, DCTELEM block[64], int off)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
897 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
898 int x, y;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
899 for(y = 0; y < 4; y++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
900 for(x = 0; x < 4; x++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
901 dst[x + y*stride] = av_clip_uint8(dst[x + y*stride] + block[off + x+y*8]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
902 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
903
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
904 static inline int adjust_pred16(int itype, int up, int left)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
905 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
906 if(!up && !left)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
907 itype = DC_128_PRED8x8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
908 else if(!up){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
909 if(itype == PLANE_PRED8x8)itype = HOR_PRED8x8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
910 if(itype == VERT_PRED8x8) itype = HOR_PRED8x8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
911 if(itype == DC_PRED8x8) itype = LEFT_DC_PRED8x8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
912 }else if(!left){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
913 if(itype == PLANE_PRED8x8)itype = VERT_PRED8x8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
914 if(itype == HOR_PRED8x8) itype = VERT_PRED8x8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
915 if(itype == DC_PRED8x8) itype = TOP_DC_PRED8x8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
916 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
917 return itype;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
918 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
919
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
920 static void rv34_output_macroblock(RV34DecContext *r, int8_t *intra_types, int cbp, int is16)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
921 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
922 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
923 DSPContext *dsp = &s->dsp;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
924 int i, j;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
925 uint8_t *Y, *U, *V;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
926 int itype;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
927 int avail[6*8] = {0};
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
928 int idx;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
929
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
930 // Set neighbour information.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
931 if(r->avail_cache[0])
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
932 avail[0] = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
933 if(r->avail_cache[1])
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
934 avail[1] = avail[2] = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
935 if(r->avail_cache[2])
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
936 avail[3] = avail[4] = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
937 if(r->avail_cache[3])
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
938 avail[5] = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
939 if(r->avail_cache[4])
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
940 avail[8] = avail[16] = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
941 if(r->avail_cache[8])
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
942 avail[24] = avail[32] = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
943
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
944 Y = s->dest[0];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
945 U = s->dest[1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
946 V = s->dest[2];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
947 if(!is16){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
948 for(j = 0; j < 4; j++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
949 idx = 9 + j*8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
950 for(i = 0; i < 4; i++, cbp >>= 1, Y += 4, idx++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
951 rv34_pred_4x4_block(r, Y, s->linesize, ittrans[intra_types[i]], avail[idx-8], avail[idx-1], avail[idx+7], avail[idx-7]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
952 avail[idx] = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
953 if(cbp & 1)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
954 rv34_add_4x4_block(Y, s->linesize, s->block[(i>>1)+(j&2)], (i&1)*4+(j&1)*32);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
955 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
956 Y += s->linesize * 4 - 4*4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
957 intra_types += s->b4_stride;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
958 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
959 intra_types -= s->b4_stride * 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
960 fill_rectangle(r->avail_cache + 5, 2, 2, 4, 0, 4);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
961 for(j = 0; j < 2; j++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
962 idx = 5 + j*4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
963 for(i = 0; i < 2; i++, cbp >>= 1, idx++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
964 rv34_pred_4x4_block(r, U + i*4 + j*4*s->uvlinesize, s->uvlinesize, ittrans[intra_types[i*2+j*2*s->b4_stride]], r->avail_cache[idx-4], r->avail_cache[idx-1], !i && !j, r->avail_cache[idx-3]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
965 rv34_pred_4x4_block(r, V + i*4 + j*4*s->uvlinesize, s->uvlinesize, ittrans[intra_types[i*2+j*2*s->b4_stride]], r->avail_cache[idx-4], r->avail_cache[idx-1], !i && !j, r->avail_cache[idx-3]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
966 r->avail_cache[idx] = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
967 if(cbp & 0x01)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
968 rv34_add_4x4_block(U + i*4 + j*4*s->uvlinesize, s->uvlinesize, s->block[4], i*4+j*32);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
969 if(cbp & 0x10)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
970 rv34_add_4x4_block(V + i*4 + j*4*s->uvlinesize, s->uvlinesize, s->block[5], i*4+j*32);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
971 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
972 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
973 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
974 itype = ittrans16[intra_types[0]];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
975 itype = adjust_pred16(itype, r->avail_cache[5-4], r->avail_cache[5-1]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
976 r->h.pred16x16[itype](Y, s->linesize);
8180
f4a291734ad7 Eliminate direct use of s->current_picture in RV30/40 decoder
kostya
parents: 8179
diff changeset
977 dsp->add_pixels_clamped(s->block[0], Y, s->linesize);
f4a291734ad7 Eliminate direct use of s->current_picture in RV30/40 decoder
kostya
parents: 8179
diff changeset
978 dsp->add_pixels_clamped(s->block[1], Y + 8, s->linesize);
f4a291734ad7 Eliminate direct use of s->current_picture in RV30/40 decoder
kostya
parents: 8179
diff changeset
979 Y += s->linesize * 8;
f4a291734ad7 Eliminate direct use of s->current_picture in RV30/40 decoder
kostya
parents: 8179
diff changeset
980 dsp->add_pixels_clamped(s->block[2], Y, s->linesize);
f4a291734ad7 Eliminate direct use of s->current_picture in RV30/40 decoder
kostya
parents: 8179
diff changeset
981 dsp->add_pixels_clamped(s->block[3], Y + 8, s->linesize);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
982
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
983 itype = ittrans16[intra_types[0]];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
984 if(itype == PLANE_PRED8x8) itype = DC_PRED8x8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
985 itype = adjust_pred16(itype, r->avail_cache[5-4], r->avail_cache[5-1]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
986 r->h.pred8x8[itype](U, s->uvlinesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
987 dsp->add_pixels_clamped(s->block[4], U, s->uvlinesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
988 r->h.pred8x8[itype](V, s->uvlinesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
989 dsp->add_pixels_clamped(s->block[5], V, s->uvlinesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
990 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
991 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
992
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
993 /** @} */ // recons group
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
994
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
995 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
996 * @addtogroup bitstream
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
997 * Decode macroblock header and return CBP in case of success, -1 otherwise.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
998 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
999 static int rv34_decode_mb_header(RV34DecContext *r, int8_t *intra_types)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1000 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1001 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1002 GetBitContext *gb = &s->gb;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1003 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1004 int i, t;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1005
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1006 if(!r->si.type){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1007 r->is16 = get_bits1(gb);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1008 if(!r->is16 && !r->rv30){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1009 if(!get_bits1(gb))
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1010 av_log(s->avctx, AV_LOG_ERROR, "Need DQUANT\n");
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1011 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1012 s->current_picture_ptr->mb_type[mb_pos] = r->is16 ? MB_TYPE_INTRA16x16 : MB_TYPE_INTRA;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1013 r->block_type = r->is16 ? RV34_MB_TYPE_INTRA16x16 : RV34_MB_TYPE_INTRA;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1014 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1015 r->block_type = r->decode_mb_info(r);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1016 if(r->block_type == -1)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1017 return -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1018 s->current_picture_ptr->mb_type[mb_pos] = rv34_mb_type_to_lavc[r->block_type];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1019 r->mb_type[mb_pos] = r->block_type;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1020 if(r->block_type == RV34_MB_SKIP){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6156
diff changeset
1021 if(s->pict_type == FF_P_TYPE)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1022 r->mb_type[mb_pos] = RV34_MB_P_16x16;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6156
diff changeset
1023 if(s->pict_type == FF_B_TYPE)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1024 r->mb_type[mb_pos] = RV34_MB_B_DIRECT;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1025 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1026 r->is16 = !!IS_INTRA16x16(s->current_picture_ptr->mb_type[mb_pos]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1027 rv34_decode_mv(r, r->block_type);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1028 if(r->block_type == RV34_MB_SKIP){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1029 fill_rectangle(intra_types, 4, 4, s->b4_stride, 0, sizeof(intra_types[0]));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1030 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1031 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1032 r->chroma_vlc = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1033 r->luma_vlc = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1034 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1035 if(IS_INTRA(s->current_picture_ptr->mb_type[mb_pos])){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1036 if(r->is16){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1037 t = get_bits(gb, 2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1038 fill_rectangle(intra_types, 4, 4, s->b4_stride, t, sizeof(intra_types[0]));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1039 r->luma_vlc = 2;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1040 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1041 if(r->decode_intra_types(r, gb, intra_types) < 0)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1042 return -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1043 r->luma_vlc = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1044 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1045 r->chroma_vlc = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1046 r->cur_vlcs = choose_vlc_set(r->si.quant, r->si.vlc_set, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1047 }else{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1048 for(i = 0; i < 16; i++)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1049 intra_types[(i & 3) + (i>>2) * s->b4_stride] = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1050 r->cur_vlcs = choose_vlc_set(r->si.quant, r->si.vlc_set, 1);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1051 if(r->mb_type[mb_pos] == RV34_MB_P_MIX16x16){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1052 r->is16 = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1053 r->chroma_vlc = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1054 r->luma_vlc = 2;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1055 r->cur_vlcs = choose_vlc_set(r->si.quant, r->si.vlc_set, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1056 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1057 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1058
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1059 return rv34_decode_cbp(gb, r->cur_vlcs, r->is16);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1060 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1061
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1062 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1063 * @addtogroup recons
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1064 * @{
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1065 */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1066 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1067 * mask for retrieving all bits in coded block pattern
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1068 * corresponding to one 8x8 block
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1069 */
8181
d8f516ca0002 33l Fix applying residue condition in RV30/40 decoder
kostya
parents: 8180
diff changeset
1070 #define LUMA_CBP_BLOCK_MASK 0x33
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1071
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1072 #define U_CBP_MASK 0x0F0000
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1073 #define V_CBP_MASK 0xF00000
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1074
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1075
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1076 static void rv34_apply_differences(RV34DecContext *r, int cbp)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1077 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1078 static const int shifts[4] = { 0, 2, 8, 10 };
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1079 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1080 int i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1081
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1082 for(i = 0; i < 4; i++)
8181
d8f516ca0002 33l Fix applying residue condition in RV30/40 decoder
kostya
parents: 8180
diff changeset
1083 if((cbp & (LUMA_CBP_BLOCK_MASK << shifts[i])) || r->block_type == RV34_MB_P_MIX16x16)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1084 s->dsp.add_pixels_clamped(s->block[i], s->dest[0] + (i & 1)*8 + (i&2)*4*s->linesize, s->linesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1085 if(cbp & U_CBP_MASK)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1086 s->dsp.add_pixels_clamped(s->block[4], s->dest[1], s->uvlinesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1087 if(cbp & V_CBP_MASK)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1088 s->dsp.add_pixels_clamped(s->block[5], s->dest[2], s->uvlinesize);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1089 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1090
8116
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1091 static int is_mv_diff_gt_3(int16_t (*motion_val)[2], int step)
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1092 {
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1093 int d;
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1094 d = motion_val[0][0] - motion_val[-step][0];
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1095 if(d < -3 || d > 3)
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1096 return 1;
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1097 d = motion_val[0][1] - motion_val[-step][1];
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1098 if(d < -3 || d > 3)
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1099 return 1;
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1100 return 0;
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1101 }
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1102
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1103 static int rv34_set_deblock_coef(RV34DecContext *r)
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1104 {
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1105 MpegEncContext *s = &r->s;
8122
aec296246352 Split RV3/4 deblock pattern into horizontal and vertical parts
kostya
parents: 8121
diff changeset
1106 int hmvmask = 0, vmvmask = 0, i, j;
8116
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1107 int midx = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1108 int16_t (*motion_val)[2] = s->current_picture_ptr->motion_val[0][midx];
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1109 for(j = 0; j < 16; j += 8){
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1110 for(i = 0; i < 2; i++){
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1111 if(is_mv_diff_gt_3(motion_val + i, 1))
8122
aec296246352 Split RV3/4 deblock pattern into horizontal and vertical parts
kostya
parents: 8121
diff changeset
1112 vmvmask |= 0x11 << (j + i*2);
8245
7e6ca1be9e40 Fix reading out of buffer during RV30/40 deblock mask calculation
kostya
parents: 8244
diff changeset
1113 if((j || s->mb_y) && is_mv_diff_gt_3(motion_val + i, s->b8_stride))
8122
aec296246352 Split RV3/4 deblock pattern into horizontal and vertical parts
kostya
parents: 8121
diff changeset
1114 hmvmask |= 0x03 << (j + i*2);
8116
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1115 }
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1116 motion_val += s->b8_stride;
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1117 }
8122
aec296246352 Split RV3/4 deblock pattern into horizontal and vertical parts
kostya
parents: 8121
diff changeset
1118 if(s->first_slice_line)
aec296246352 Split RV3/4 deblock pattern into horizontal and vertical parts
kostya
parents: 8121
diff changeset
1119 hmvmask &= ~0x000F;
aec296246352 Split RV3/4 deblock pattern into horizontal and vertical parts
kostya
parents: 8121
diff changeset
1120 if(!s->mb_x)
aec296246352 Split RV3/4 deblock pattern into horizontal and vertical parts
kostya
parents: 8121
diff changeset
1121 vmvmask &= ~0x1111;
8368
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1122 if(r->rv30){ //RV30 marks both subblocks on the edge for filtering
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1123 vmvmask |= (vmvmask & 0x4444) >> 1;
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1124 hmvmask |= (hmvmask & 0x0F00) >> 4;
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1125 if(s->mb_x)
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1126 r->deblock_coefs[s->mb_x - 1 + s->mb_y*s->mb_stride] |= (vmvmask & 0x1111) << 3;
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1127 if(!s->first_slice_line)
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1128 r->deblock_coefs[s->mb_x + (s->mb_y - 1)*s->mb_stride] |= (hmvmask & 0xF) << 12;
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1129 }
a7c85cdc11b5 Generate correct deblock pattern for RV30
kostya
parents: 8278
diff changeset
1130 return hmvmask | vmvmask;
8116
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1131 }
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1132
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1133 static int rv34_decode_macroblock(RV34DecContext *r, int8_t *intra_types)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1134 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1135 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1136 GetBitContext *gb = &s->gb;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1137 int cbp, cbp2;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1138 int i, blknum, blkoff;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1139 DCTELEM block16[64];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1140 int luma_dc_quant;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1141 int dist;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1142 int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1143
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1144 // Calculate which neighbours are available. Maybe it's worth optimizing too.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1145 memset(r->avail_cache, 0, sizeof(r->avail_cache));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1146 fill_rectangle(r->avail_cache + 5, 2, 2, 4, 1, 4);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1147 dist = (s->mb_x - s->resync_mb_x) + (s->mb_y - s->resync_mb_y) * s->mb_width;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1148 if(s->mb_x && dist)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1149 r->avail_cache[4] =
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1150 r->avail_cache[8] = s->current_picture_ptr->mb_type[mb_pos - 1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1151 if(dist >= s->mb_width)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1152 r->avail_cache[1] =
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1153 r->avail_cache[2] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1154 if(((s->mb_x+1) < s->mb_width) && dist >= s->mb_width - 1)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1155 r->avail_cache[3] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride + 1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1156 if(s->mb_x && dist > s->mb_width)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1157 r->avail_cache[0] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride - 1];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1158
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1159 s->qscale = r->si.quant;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1160 cbp = cbp2 = rv34_decode_mb_header(r, intra_types);
8370
edea96e4367b use precalculated mb_pos where available
kostya
parents: 8369
diff changeset
1161 r->cbp_luma [mb_pos] = cbp;
edea96e4367b use precalculated mb_pos where available
kostya
parents: 8369
diff changeset
1162 r->cbp_chroma[mb_pos] = cbp >> 16;
8116
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1163 if(s->pict_type == FF_I_TYPE)
8369
45c3780b1a96 Merge deblocking pattern with CBP for RV30/40 loop filtering
kostya
parents: 8368
diff changeset
1164 r->deblock_coefs[mb_pos] = 0xFFFF;
8116
2d01559f824c Calculating an additional MV-based deblocking pattern is the same
kostya
parents: 8099
diff changeset
1165 else
8369
45c3780b1a96 Merge deblocking pattern with CBP for RV30/40 loop filtering
kostya
parents: 8368
diff changeset
1166 r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r) | r->cbp_luma[mb_pos];
8370
edea96e4367b use precalculated mb_pos where available
kostya
parents: 8369
diff changeset
1167 s->current_picture_ptr->qscale_table[mb_pos] = s->qscale;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1168
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1169 if(cbp == -1)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1170 return -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1171
8046
6df5221c3e26 Choose RV3/4 DC quantizer correctly
kostya
parents: 8038
diff changeset
1172 luma_dc_quant = r->block_type == RV34_MB_P_MIX16x16 ? r->luma_dc_quant_p[s->qscale] : r->luma_dc_quant_i[s->qscale];
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1173 if(r->is16){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1174 memset(block16, 0, sizeof(block16));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1175 rv34_decode_block(block16, gb, r->cur_vlcs, 3, 0);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1176 rv34_dequant4x4_16x16(block16, rv34_qscale_tab[luma_dc_quant],rv34_qscale_tab[s->qscale]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1177 rv34_inv_transform_noround(block16);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1178 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1179
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1180 for(i = 0; i < 16; i++, cbp >>= 1){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1181 if(!r->is16 && !(cbp & 1)) continue;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1182 blknum = ((i & 2) >> 1) + ((i & 8) >> 2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1183 blkoff = ((i & 1) << 2) + ((i & 4) << 3);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1184 if(cbp & 1)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1185 rv34_decode_block(s->block[blknum] + blkoff, gb, r->cur_vlcs, r->luma_vlc, 0);
8046
6df5221c3e26 Choose RV3/4 DC quantizer correctly
kostya
parents: 8038
diff changeset
1186 rv34_dequant4x4(s->block[blknum] + blkoff, rv34_qscale_tab[s->qscale],rv34_qscale_tab[s->qscale]);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1187 if(r->is16) //FIXME: optimize
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1188 s->block[blknum][blkoff] = block16[(i & 3) | ((i & 0xC) << 1)];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1189 rv34_inv_transform(s->block[blknum] + blkoff);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1190 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1191 if(r->block_type == RV34_MB_P_MIX16x16)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1192 r->cur_vlcs = choose_vlc_set(r->si.quant, r->si.vlc_set, 1);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1193 for(; i < 24; i++, cbp >>= 1){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1194 if(!(cbp & 1)) continue;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1195 blknum = ((i & 4) >> 2) + 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1196 blkoff = ((i & 1) << 2) + ((i & 2) << 4);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1197 rv34_decode_block(s->block[blknum] + blkoff, gb, r->cur_vlcs, r->chroma_vlc, 1);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1198 rv34_dequant4x4(s->block[blknum] + blkoff, rv34_qscale_tab[rv34_chroma_quant[1][s->qscale]],rv34_qscale_tab[rv34_chroma_quant[0][s->qscale]]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1199 rv34_inv_transform(s->block[blknum] + blkoff);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1200 }
8370
edea96e4367b use precalculated mb_pos where available
kostya
parents: 8369
diff changeset
1201 if(IS_INTRA(s->current_picture_ptr->mb_type[mb_pos]))
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1202 rv34_output_macroblock(r, intra_types, cbp2, r->is16);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1203 else
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1204 rv34_apply_differences(r, cbp2);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1205
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1206 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1207 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1208
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1209 static int check_slice_end(RV34DecContext *r, MpegEncContext *s)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1210 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1211 int bits;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1212 if(s->mb_y >= s->mb_height)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1213 return 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1214 if(!s->mb_num_left)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1215 return 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1216 if(r->s.mb_skip_run > 1)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1217 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1218 bits = r->bits - get_bits_count(&s->gb);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1219 if(bits < 0 || (bits < 8 && !show_bits(&s->gb, bits)))
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1220 return 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1221 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1222 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1223
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1224 static inline int slice_compare(SliceInfo *si1, SliceInfo *si2)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1225 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1226 return si1->type != si2->type ||
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1227 si1->start >= si2->start ||
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1228 si1->width != si2->width ||
6714
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
1229 si1->height != si2->height||
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
1230 si1->pts != si2->pts;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1231 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1232
8371
2ebc9b2c7459 add const qualifier to some pointers for input data
kostya
parents: 8370
diff changeset
1233 static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int buf_size)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1234 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1235 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1236 GetBitContext *gb = &s->gb;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1237 int mb_pos;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1238 int res;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1239
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1240 init_get_bits(&r->s.gb, buf, buf_size*8);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1241 res = r->parse_slice_header(r, gb, &r->si);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1242 if(res < 0){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1243 av_log(s->avctx, AV_LOG_ERROR, "Incorrect or unknown slice header\n");
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1244 return -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1245 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1246
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1247 if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1248 if(s->width != r->si.width || s->height != r->si.height){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1249 av_log(s->avctx, AV_LOG_DEBUG, "Changing dimensions to %dx%d\n", r->si.width,r->si.height);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1250 MPV_common_end(s);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1251 s->width = r->si.width;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1252 s->height = r->si.height;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1253 if(MPV_common_init(s) < 0)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1254 return -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1255 r->intra_types_hist = av_realloc(r->intra_types_hist, s->b4_stride * 4 * 2 * sizeof(*r->intra_types_hist));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1256 r->intra_types = r->intra_types_hist + s->b4_stride * 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1257 r->mb_type = av_realloc(r->mb_type, r->s.mb_stride * r->s.mb_height * sizeof(*r->mb_type));
6155
a425bdc70ac5 Save coded block patterns for future loop filtering.
kostya
parents: 6121
diff changeset
1258 r->cbp_luma = av_realloc(r->cbp_luma, r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_luma));
a425bdc70ac5 Save coded block patterns for future loop filtering.
kostya
parents: 6121
diff changeset
1259 r->cbp_chroma = av_realloc(r->cbp_chroma, r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_chroma));
8037
b6d93bef844a RV3 and RV4 decoders set some deblocking coefs for each macroblock,
kostya
parents: 8036
diff changeset
1260 r->deblock_coefs = av_realloc(r->deblock_coefs, r->s.mb_stride * r->s.mb_height * sizeof(*r->deblock_coefs));
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1261 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6156
diff changeset
1262 s->pict_type = r->si.type ? r->si.type : FF_I_TYPE;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1263 if(MPV_frame_start(s, s->avctx) < 0)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1264 return -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1265 ff_er_frame_start(s);
6714
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
1266 r->cur_pts = r->si.pts;
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
1267 if(s->pict_type != FF_B_TYPE){
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
1268 r->last_pts = r->next_pts;
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
1269 r->next_pts = r->cur_pts;
05c3a4b419e9 Calculate motion vector information based on PTS provided in slice header
kostya
parents: 6693
diff changeset
1270 }
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1271 s->mb_x = s->mb_y = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1272 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1273
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1274 r->si.end = end;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1275 s->qscale = r->si.quant;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1276 r->bits = buf_size*8;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1277 s->mb_num_left = r->si.end - r->si.start;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1278 r->s.mb_skip_run = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1279
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1280 mb_pos = s->mb_x + s->mb_y * s->mb_width;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1281 if(r->si.start != mb_pos){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1282 av_log(s->avctx, AV_LOG_ERROR, "Slice indicates MB offset %d, got %d\n", r->si.start, mb_pos);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1283 s->mb_x = r->si.start % s->mb_width;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1284 s->mb_y = r->si.start / s->mb_width;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1285 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1286 memset(r->intra_types_hist, -1, s->b4_stride * 4 * 2 * sizeof(*r->intra_types_hist));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1287 s->first_slice_line = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1288 s->resync_mb_x= s->mb_x;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1289 s->resync_mb_y= s->mb_y;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1290
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1291 ff_init_block_index(s);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1292 while(!check_slice_end(r, s)) {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1293 ff_update_block_index(s);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1294 s->dsp.clear_blocks(s->block[0]);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1295
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1296 if(rv34_decode_macroblock(r, r->intra_types + s->mb_x * 4 + 1) < 0){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1297 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_ERROR|DC_ERROR|MV_ERROR);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1298 return -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1299 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1300 if (++s->mb_x == s->mb_width) {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1301 s->mb_x = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1302 s->mb_y++;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1303 ff_init_block_index(s);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1304
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1305 memmove(r->intra_types_hist, r->intra_types, s->b4_stride * 4 * sizeof(*r->intra_types_hist));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1306 memset(r->intra_types, -1, s->b4_stride * 4 * sizeof(*r->intra_types_hist));
8224
6771b3544991 Invoke future RV30/40 loop filter for already decoded rows instead of
kostya
parents: 8221
diff changeset
1307
6771b3544991 Invoke future RV30/40 loop filter for already decoded rows instead of
kostya
parents: 8221
diff changeset
1308 if(r->loop_filter && s->mb_y >= 2)
6771b3544991 Invoke future RV30/40 loop filter for already decoded rows instead of
kostya
parents: 8221
diff changeset
1309 r->loop_filter(r, s->mb_y - 2);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1310 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1311 if(s->mb_x == s->resync_mb_x)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1312 s->first_slice_line=0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1313 s->mb_num_left--;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1314 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1315 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1316
6750
c93570aeb3eb Remove unnecessary parentheses from return calls.
diego
parents: 6714
diff changeset
1317 return s->mb_y == s->mb_height;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1318 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1319
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1320 /** @} */ // recons group end
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1321
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1322 /**
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1323 * Initialize decoder.
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1324 */
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
1325 av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1326 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1327 RV34DecContext *r = avctx->priv_data;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1328 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1329
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1330 MPV_decode_defaults(s);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1331 s->avctx= avctx;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1332 s->out_format = FMT_H263;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1333 s->codec_id= avctx->codec_id;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1334
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1335 s->width = avctx->width;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1336 s->height = avctx->height;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1337
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1338 r->s.avctx = avctx;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1339 avctx->flags |= CODEC_FLAG_EMU_EDGE;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1340 r->s.flags |= CODEC_FLAG_EMU_EDGE;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1341 avctx->pix_fmt = PIX_FMT_YUV420P;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1342 avctx->has_b_frames = 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1343 s->low_delay = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1344
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1345 if (MPV_common_init(s) < 0)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1346 return -1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1347
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1348 ff_h264_pred_init(&r->h, CODEC_ID_RV40);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1349
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1350 r->intra_types_hist = av_malloc(s->b4_stride * 4 * 2 * sizeof(*r->intra_types_hist));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1351 r->intra_types = r->intra_types_hist + s->b4_stride * 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1352
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1353 r->mb_type = av_mallocz(r->s.mb_stride * r->s.mb_height * sizeof(*r->mb_type));
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1354
6155
a425bdc70ac5 Save coded block patterns for future loop filtering.
kostya
parents: 6121
diff changeset
1355 r->cbp_luma = av_malloc(r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_luma));
a425bdc70ac5 Save coded block patterns for future loop filtering.
kostya
parents: 6121
diff changeset
1356 r->cbp_chroma = av_malloc(r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_chroma));
8037
b6d93bef844a RV3 and RV4 decoders set some deblocking coefs for each macroblock,
kostya
parents: 8036
diff changeset
1357 r->deblock_coefs = av_malloc(r->s.mb_stride * r->s.mb_height * sizeof(*r->deblock_coefs));
6155
a425bdc70ac5 Save coded block patterns for future loop filtering.
kostya
parents: 6121
diff changeset
1358
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1359 if(!intra_vlcs[0].cbppattern[0].bits)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1360 rv34_init_tables();
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1361
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1362 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1363 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1364
8371
2ebc9b2c7459 add const qualifier to some pointers for input data
kostya
parents: 8370
diff changeset
1365 static int get_slice_offset(AVCodecContext *avctx, const uint8_t *buf, int n)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1366 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1367 if(avctx->slice_count) return avctx->slice_offset[n];
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1368 else return AV_RL32(buf + n*8 - 4) == 1 ? AV_RL32(buf + n*8) : AV_RB32(buf + n*8);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1369 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1370
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1371 int ff_rv34_decode_frame(AVCodecContext *avctx,
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1372 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9168
diff changeset
1373 AVPacket *avpkt)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1374 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9168
diff changeset
1375 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9168
diff changeset
1376 int buf_size = avpkt->size;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1377 RV34DecContext *r = avctx->priv_data;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1378 MpegEncContext *s = &r->s;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1379 AVFrame *pict = data;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1380 SliceInfo si;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1381 int i;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1382 int slice_count;
8371
2ebc9b2c7459 add const qualifier to some pointers for input data
kostya
parents: 8370
diff changeset
1383 const uint8_t *slices_hdr = NULL;
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1384 int last = 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1385
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1386 /* no supplementary picture */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1387 if (buf_size == 0) {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1388 /* special case for last picture */
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1389 if (s->low_delay==0 && s->next_picture_ptr) {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1390 *pict= *(AVFrame*)s->next_picture_ptr;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1391 s->next_picture_ptr= NULL;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1392
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1393 *data_size = sizeof(AVFrame);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1394 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1395 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1396 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1397
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1398 if(!avctx->slice_count){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1399 slice_count = (*buf++) + 1;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1400 slices_hdr = buf + 4;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1401 buf += 8 * slice_count;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1402 }else
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1403 slice_count = avctx->slice_count;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1404
8754
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1405 //parse first slice header to check whether this frame can be decoded
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1406 if(get_slice_offset(avctx, slices_hdr, 0) > buf_size){
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1407 av_log(avctx, AV_LOG_ERROR, "Slice offset is greater than frame size\n");
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1408 return -1;
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1409 }
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1410 init_get_bits(&s->gb, buf+get_slice_offset(avctx, slices_hdr, 0), buf_size-get_slice_offset(avctx, slices_hdr, 0));
8821
58706d84c938 In RV3/4 nonzero MB offset for the first slice also indicates error
kostya
parents: 8754
diff changeset
1411 if(r->parse_slice_header(r, &r->s.gb, &si) < 0 || si.start){
8754
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1412 av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n");
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1413 return -1;
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1414 }
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1415 if((!s->last_picture_ptr || !s->last_picture_ptr->data[0]) && si.type == FF_B_TYPE)
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1416 return -1;
8827
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1417 /* skip b frames if we are in a hurry */
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1418 if(avctx->hurry_up && si.type==FF_B_TYPE) return buf_size;
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1419 if( (avctx->skip_frame >= AVDISCARD_NONREF && si.type==FF_B_TYPE)
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1420 || (avctx->skip_frame >= AVDISCARD_NONKEY && si.type!=FF_I_TYPE)
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1421 || avctx->skip_frame >= AVDISCARD_ALL)
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1422 return buf_size;
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1423 /* skip everything if we are in a hurry>=5 */
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1424 if(avctx->hurry_up>=5)
03ea23e85f42 Enable dropping frames for RV3/4
kostya
parents: 8821
diff changeset
1425 return buf_size;
8754
f471abd09fef Move RV3/4 frame type check up so 1-slice unanchored B-frames are checked, too.
kostya
parents: 8721
diff changeset
1426
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1427 for(i=0; i<slice_count; i++){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1428 int offset= get_slice_offset(avctx, slices_hdr, i);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1429 int size;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1430 if(i+1 == slice_count)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1431 size= buf_size - offset;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1432 else
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1433 size= get_slice_offset(avctx, slices_hdr, i+1) - offset;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1434
8243
d5949e5d36f3 Check RV30/40 slice offsets to be inside buffer.
kostya
parents: 8242
diff changeset
1435 if(offset > buf_size){
d5949e5d36f3 Check RV30/40 slice offsets to be inside buffer.
kostya
parents: 8242
diff changeset
1436 av_log(avctx, AV_LOG_ERROR, "Slice offset is greater than frame size\n");
d5949e5d36f3 Check RV30/40 slice offsets to be inside buffer.
kostya
parents: 8242
diff changeset
1437 break;
d5949e5d36f3 Check RV30/40 slice offsets to be inside buffer.
kostya
parents: 8242
diff changeset
1438 }
d5949e5d36f3 Check RV30/40 slice offsets to be inside buffer.
kostya
parents: 8242
diff changeset
1439
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1440 r->si.end = s->mb_width * s->mb_height;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1441 if(i+1 < slice_count){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1442 init_get_bits(&s->gb, buf+get_slice_offset(avctx, slices_hdr, i+1), (buf_size-get_slice_offset(avctx, slices_hdr, i+1))*8);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1443 if(r->parse_slice_header(r, &r->s.gb, &si) < 0){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1444 if(i+2 < slice_count)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1445 size = get_slice_offset(avctx, slices_hdr, i+2) - offset;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1446 else
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1447 size = buf_size - offset;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1448 }else
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1449 r->si.end = si.start;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1450 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1451 last = rv34_decode_slice(r, r->si.end, buf + offset, size);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1452 s->mb_num_left = r->s.mb_x + r->s.mb_y*r->s.mb_width - r->si.start;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1453 if(last)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1454 break;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1455 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1456
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1457 if(last){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1458 if(r->loop_filter)
8224
6771b3544991 Invoke future RV30/40 loop filter for already decoded rows instead of
kostya
parents: 8221
diff changeset
1459 r->loop_filter(r, s->mb_height - 1);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1460 ff_er_frame_end(s);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1461 MPV_frame_end(s);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6156
diff changeset
1462 if (s->pict_type == FF_B_TYPE || s->low_delay) {
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1463 *pict= *(AVFrame*)s->current_picture_ptr;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1464 } else if (s->last_picture_ptr != NULL) {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1465 *pict= *(AVFrame*)s->last_picture_ptr;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1466 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1467
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1468 if(s->last_picture_ptr || s->low_delay){
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1469 *data_size = sizeof(AVFrame);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1470 ff_print_debug_info(s, pict);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1471 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1472 s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...)
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1473 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1474 return buf_size;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1475 }
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1476
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6481
diff changeset
1477 av_cold int ff_rv34_decode_end(AVCodecContext *avctx)
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1478 {
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1479 RV34DecContext *r = avctx->priv_data;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1480
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1481 MPV_common_end(&r->s);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1482
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1483 av_freep(&r->intra_types_hist);
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1484 r->intra_types = NULL;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1485 av_freep(&r->mb_type);
8038
efc935702bce 34l: free RV3/4 context variables at the end
kostya
parents: 8037
diff changeset
1486 av_freep(&r->cbp_luma);
efc935702bce 34l: free RV3/4 context variables at the end
kostya
parents: 8037
diff changeset
1487 av_freep(&r->cbp_chroma);
efc935702bce 34l: free RV3/4 context variables at the end
kostya
parents: 8037
diff changeset
1488 av_freep(&r->deblock_coefs);
6026
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1489
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1490 return 0;
49c086b24908 RV30/40 decoding core
kostya
parents:
diff changeset
1491 }