Mercurial > libavcodec.hg

comparison indeo5.c @ 11213:384b6a615a92 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove ivi5_scans8x8[0], it duplicates ff_zigzag_direct
author stefang
date Fri, 19 Feb 2010 17:17:20 +0000
parents 1d4aeef800d4
children b75449aaea3e
comparison
equal deleted inserted replaced
11212:4a0b77af9d9c 11213:384b6a615a92
28 */ 28 */
29 29
30 #define ALT_BITSTREAM_READER_LE 30 #define ALT_BITSTREAM_READER_LE
31 #include "avcodec.h" 31 #include "avcodec.h"
32 #include "get_bits.h" 32 #include "get_bits.h"
33 #include "dsputil.h"
33 #include "ivi_dsp.h" 34 #include "ivi_dsp.h"
34 #include "ivi_common.h" 35 #include "ivi_common.h"
35 #include "indeo5data.h" 36 #include "indeo5data.h"
36 37
37 /** 38 /**
181 /* select transform function and scan pattern according to plane and band number */ 182 /* select transform function and scan pattern according to plane and band number */
182 switch ((p << 2) + i) { 183 switch ((p << 2) + i) {
183 case 0: 184 case 0:
184 band->inv_transform = ff_ivi_inverse_slant_8x8; 185 band->inv_transform = ff_ivi_inverse_slant_8x8;
185 band->dc_transform = ff_ivi_dc_slant_2d; 186 band->dc_transform = ff_ivi_dc_slant_2d;
186 band->scan = ivi5_scans8x8[0]; 187 band->scan = ff_zigzag_direct;
187 break; 188 break;
188 189
189 case 1: 190 case 1:
190 band->inv_transform = ff_ivi_row_slant8; 191 band->inv_transform = ff_ivi_row_slant8;
191 band->dc_transform = ff_ivi_dc_row_slant; 192 band->dc_transform = ff_ivi_dc_row_slant;
192 band->scan = ivi5_scans8x8[1]; 193 band->scan = ivi5_scans8x8[0];
193 break; 194 break;
194 195
195 case 2: 196 case 2:
196 band->inv_transform = ff_ivi_col_slant8; 197 band->inv_transform = ff_ivi_col_slant8;
197 band->dc_transform = ff_ivi_dc_col_slant; 198 band->dc_transform = ff_ivi_dc_col_slant;
198 band->scan = ivi5_scans8x8[2]; 199 band->scan = ivi5_scans8x8[1];
199 break; 200 break;
200 201
201 case 3: 202 case 3:
202 band->inv_transform = ff_ivi_put_pixels_8x8; 203 band->inv_transform = ff_ivi_put_pixels_8x8;
203 band->dc_transform = ff_ivi_put_dc_pixel_8x8; 204 band->dc_transform = ff_ivi_put_dc_pixel_8x8;
204 band->scan = ivi5_scans8x8[2]; 205 band->scan = ivi5_scans8x8[1];
205 break; 206 break;
206 207
207 case 4: 208 case 4:
208 band->inv_transform = ff_ivi_inverse_slant_4x4; 209 band->inv_transform = ff_ivi_inverse_slant_4x4;
209 band->dc_transform = ff_ivi_dc_slant_2d; 210 band->dc_transform = ff_ivi_dc_slant_2d;