Mercurial > libavcodec.hg
comparison asv1.c @ 1433:46d3fa8501cd libavcodec
ASV2 decoder
author | michaelni |
---|---|
date | Mon, 01 Sep 2003 08:10:01 +0000 |
parents | 1cbc2380d172 |
children | f98e81331a6f |
comparison
equal
deleted
inserted
replaced
1432:7406ed4479f7 | 1433:46d3fa8501cd |
---|---|
1 /* | 1 /* |
2 * ASUS V1 codec | 2 * ASUS V1/V2 codec |
3 * Copyright (c) 2003 Michael Niedermayer | 3 * Copyright (c) 2003 Michael Niedermayer |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Lesser General Public | 6 * modify it under the terms of the GNU Lesser General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 */ | 18 */ |
19 | 19 |
20 /** | 20 /** |
21 * @file asv1.c | 21 * @file asv1.c |
22 * ASUS V1 codec. | 22 * ASUS V1/V2 codec. |
23 */ | 23 */ |
24 | 24 |
25 #include "avcodec.h" | 25 #include "avcodec.h" |
26 #include "dsputil.h" | 26 #include "dsputil.h" |
27 #include "mpegvideo.h" | 27 #include "mpegvideo.h" |
28 | 28 |
29 //#undef NDEBUG | 29 //#undef NDEBUG |
30 //#include <assert.h> | 30 //#include <assert.h> |
31 | 31 |
32 #define VLC_BITS 5 | 32 #define VLC_BITS 6 |
33 | 33 #define ASV2_LEVEL_VLC_BITS 10 |
34 | |
34 typedef struct ASV1Context{ | 35 typedef struct ASV1Context{ |
35 AVCodecContext *avctx; | 36 AVCodecContext *avctx; |
36 DSPContext dsp; | 37 DSPContext dsp; |
37 AVFrame picture; | 38 AVFrame picture; |
38 PutBitContext pb; | 39 PutBitContext pb; |
54 0x00,0x08,0x01,0x09,0x10,0x18,0x11,0x19, | 55 0x00,0x08,0x01,0x09,0x10,0x18,0x11,0x19, |
55 0x02,0x0A,0x03,0x0B,0x12,0x1A,0x13,0x1B, | 56 0x02,0x0A,0x03,0x0B,0x12,0x1A,0x13,0x1B, |
56 0x04,0x0C,0x05,0x0D,0x20,0x28,0x21,0x29, | 57 0x04,0x0C,0x05,0x0D,0x20,0x28,0x21,0x29, |
57 0x06,0x0E,0x07,0x0F,0x14,0x1C,0x15,0x1D, | 58 0x06,0x0E,0x07,0x0F,0x14,0x1C,0x15,0x1D, |
58 0x22,0x2A,0x23,0x2B,0x30,0x38,0x31,0x39, | 59 0x22,0x2A,0x23,0x2B,0x30,0x38,0x31,0x39, |
60 0x16,0x1E,0x17,0x1F,0x24,0x2C,0x25,0x2D, | |
61 0x32,0x3A,0x33,0x3B,0x26,0x2E,0x27,0x2F, | |
62 0x34,0x3C,0x35,0x3D,0x36,0x3E,0x37,0x3F, | |
63 }; | |
64 | |
65 | |
66 static const uint8_t reverse[256]={ | |
67 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, | |
68 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, | |
69 0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, | |
70 0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC, | |
71 0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2, | |
72 0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA, | |
73 0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6, | |
74 0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE, | |
75 0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1, | |
76 0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9, | |
77 0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5, | |
78 0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD, | |
79 0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3, | |
80 0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB, | |
81 0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, | |
82 0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF, | |
59 }; | 83 }; |
60 | 84 |
61 static const uint8_t ccp_tab[17][2]={ | 85 static const uint8_t ccp_tab[17][2]={ |
62 {0x2,2}, {0xE,5}, {0xD,5}, {0xC,5}, | 86 {0x2,2}, {0x7,5}, {0xB,5}, {0x3,5}, |
63 {0xB,5}, {0xA,5}, {0x9,5}, {0x8,5}, | 87 {0xD,5}, {0x5,5}, {0x9,5}, {0x1,5}, |
64 {0x7,5}, {0x6,5}, {0x5,5}, {0x4,5}, | 88 {0xE,5}, {0x6,5}, {0xA,5}, {0x2,5}, |
65 {0x3,5}, {0x2,5}, {0x1,5}, {0x3,2}, | 89 {0xC,5}, {0x4,5}, {0x8,5}, {0x3,2}, |
66 {0xF,5}, //EOB | 90 {0xF,5}, //EOB |
67 }; | 91 }; |
68 | 92 |
69 static const uint8_t level_tab[7][2]={ | 93 static const uint8_t level_tab[7][2]={ |
70 {3,4}, {3,3}, {3,2}, {0,3}, {2,2}, {2,3}, {2,4} | 94 {3,4}, {3,3}, {3,2}, {0,3}, {2,2}, {2,3}, {2,4} |
71 }; | 95 }; |
72 | 96 |
97 static const uint8_t dc_ccp_tab[8][2]={ | |
98 {0x1,2}, {0xD,4}, {0xF,4}, {0xC,4}, | |
99 {0x5,3}, {0xE,4}, {0x4,3}, {0x0,2}, | |
100 }; | |
101 | |
102 static const uint8_t ac_ccp_tab[16][2]={ | |
103 {0x00,2}, {0x3B,6}, {0x0A,4}, {0x3A,6}, | |
104 {0x02,3}, {0x39,6}, {0x3C,6}, {0x38,6}, | |
105 {0x03,3}, {0x3D,6}, {0x08,4}, {0x1F,5}, | |
106 {0x09,4}, {0x0B,4}, {0x0D,4}, {0x0C,4}, | |
107 }; | |
108 | |
109 static const uint8_t asv2_level_tab[63][2]={ | |
110 {0x3F,10},{0x2F,10},{0x37,10},{0x27,10},{0x3B,10},{0x2B,10},{0x33,10},{0x23,10}, | |
111 {0x3D,10},{0x2D,10},{0x35,10},{0x25,10},{0x39,10},{0x29,10},{0x31,10},{0x21,10}, | |
112 {0x1F, 8},{0x17, 8},{0x1B, 8},{0x13, 8},{0x1D, 8},{0x15, 8},{0x19, 8},{0x11, 8}, | |
113 {0x0F, 6},{0x0B, 6},{0x0D, 6},{0x09, 6}, | |
114 {0x07, 4},{0x05, 4}, | |
115 {0x03, 2}, | |
116 {0x00, 5}, | |
117 {0x02, 2}, | |
118 {0x04, 4},{0x06, 4}, | |
119 {0x08, 6},{0x0C, 6},{0x0A, 6},{0x0E, 6}, | |
120 {0x10, 8},{0x18, 8},{0x14, 8},{0x1C, 8},{0x12, 8},{0x1A, 8},{0x16, 8},{0x1E, 8}, | |
121 {0x20,10},{0x30,10},{0x28,10},{0x38,10},{0x24,10},{0x34,10},{0x2C,10},{0x3C,10}, | |
122 {0x22,10},{0x32,10},{0x2A,10},{0x3A,10},{0x26,10},{0x36,10},{0x2E,10},{0x3E,10}, | |
123 }; | |
124 | |
125 | |
73 static VLC ccp_vlc; | 126 static VLC ccp_vlc; |
74 static VLC level_vlc; | 127 static VLC level_vlc; |
128 static VLC dc_ccp_vlc; | |
129 static VLC ac_ccp_vlc; | |
130 static VLC asv2_level_vlc; | |
75 | 131 |
76 static void init_vlcs(ASV1Context *a){ | 132 static void init_vlcs(ASV1Context *a){ |
77 static int done = 0; | 133 static int done = 0; |
78 | 134 |
79 if (!done) { | 135 if (!done) { |
80 done = 1; | 136 done = 1; |
81 | 137 |
82 init_vlc(&ccp_vlc, VLC_BITS, 17, | 138 init_vlc(&ccp_vlc, VLC_BITS, 17, |
83 &ccp_tab[0][1], 2, 1, | 139 &ccp_tab[0][1], 2, 1, |
84 &ccp_tab[0][0], 2, 1); | 140 &ccp_tab[0][0], 2, 1); |
141 init_vlc(&dc_ccp_vlc, VLC_BITS, 8, | |
142 &dc_ccp_tab[0][1], 2, 1, | |
143 &dc_ccp_tab[0][0], 2, 1); | |
144 init_vlc(&ac_ccp_vlc, VLC_BITS, 16, | |
145 &ac_ccp_tab[0][1], 2, 1, | |
146 &ac_ccp_tab[0][0], 2, 1); | |
85 init_vlc(&level_vlc, VLC_BITS, 7, | 147 init_vlc(&level_vlc, VLC_BITS, 7, |
86 &level_tab[0][1], 2, 1, | 148 &level_tab[0][1], 2, 1, |
87 &level_tab[0][0], 2, 1); | 149 &level_tab[0][0], 2, 1); |
88 } | 150 init_vlc(&asv2_level_vlc, ASV2_LEVEL_VLC_BITS, 63, |
89 } | 151 &asv2_level_tab[0][1], 2, 1, |
90 | 152 &asv2_level_tab[0][0], 2, 1); |
91 static inline int get_level(GetBitContext *gb){ | 153 } |
154 } | |
155 | |
156 //FIXME write a reversed bitstream reader to avoid the double reverse | |
157 static inline int asv2_get_bits(GetBitContext *gb, int n){ | |
158 return reverse[ get_bits(gb, n) << (8-n) ]; | |
159 } | |
160 | |
161 static inline int asv1_get_level(GetBitContext *gb){ | |
92 int code= get_vlc2(gb, level_vlc.table, VLC_BITS, 1); | 162 int code= get_vlc2(gb, level_vlc.table, VLC_BITS, 1); |
93 | 163 |
94 if(code==3) return get_sbits(gb, 8); | 164 if(code==3) return get_sbits(gb, 8); |
95 else return code - 3; | 165 else return code - 3; |
96 } | 166 } |
97 | 167 |
98 static inline void put_level(PutBitContext *pb, int level){ | 168 static inline int asv2_get_level(GetBitContext *gb){ |
169 int code= get_vlc2(gb, asv2_level_vlc.table, ASV2_LEVEL_VLC_BITS, 1); | |
170 | |
171 if(code==31) return (int8_t)asv2_get_bits(gb, 8); | |
172 else return code - 31; | |
173 } | |
174 | |
175 static inline void asv1_put_level(PutBitContext *pb, int level){ | |
99 unsigned int index= level + 3; | 176 unsigned int index= level + 3; |
100 | 177 |
101 if(index <= 6) put_bits(pb, level_tab[index][1], level_tab[index][0]); | 178 if(index <= 6) put_bits(pb, level_tab[index][1], level_tab[index][0]); |
102 else{ | 179 else{ |
103 put_bits(pb, level_tab[3][1], level_tab[3][0]); | 180 put_bits(pb, level_tab[3][1], level_tab[3][0]); |
104 put_bits(pb, 8, level&0xFF); | 181 put_bits(pb, 8, level&0xFF); |
105 } | 182 } |
106 } | 183 } |
107 | 184 |
108 static inline int decode_block(ASV1Context *a, DCTELEM block[64]){ | 185 static inline int asv1_decode_block(ASV1Context *a, DCTELEM block[64]){ |
109 int i; | 186 int i; |
110 | 187 |
111 block[0]= 8*get_bits(&a->gb, 8); | 188 block[0]= 8*get_bits(&a->gb, 8); |
112 | 189 |
113 for(i=0; i<11; i++){ | 190 for(i=0; i<11; i++){ |
118 if(ccp < 0 || i>=10){ | 195 if(ccp < 0 || i>=10){ |
119 printf("coded coeff pattern damaged\n"); | 196 printf("coded coeff pattern damaged\n"); |
120 return -1; | 197 return -1; |
121 } | 198 } |
122 | 199 |
123 if(ccp&1) block[a->scantable.permutated[4*i+0]]= (get_level(&a->gb) * a->intra_matrix[4*i+0])>>4; | 200 if(ccp&8) block[a->scantable.permutated[4*i+0]]= (asv1_get_level(&a->gb) * a->intra_matrix[4*i+0])>>4; |
124 if(ccp&2) block[a->scantable.permutated[4*i+1]]= (get_level(&a->gb) * a->intra_matrix[4*i+1])>>4; | 201 if(ccp&4) block[a->scantable.permutated[4*i+1]]= (asv1_get_level(&a->gb) * a->intra_matrix[4*i+1])>>4; |
125 if(ccp&4) block[a->scantable.permutated[4*i+2]]= (get_level(&a->gb) * a->intra_matrix[4*i+2])>>4; | 202 if(ccp&2) block[a->scantable.permutated[4*i+2]]= (asv1_get_level(&a->gb) * a->intra_matrix[4*i+2])>>4; |
126 if(ccp&8) block[a->scantable.permutated[4*i+3]]= (get_level(&a->gb) * a->intra_matrix[4*i+3])>>4; | 203 if(ccp&1) block[a->scantable.permutated[4*i+3]]= (asv1_get_level(&a->gb) * a->intra_matrix[4*i+3])>>4; |
127 } | 204 } |
128 } | 205 } |
129 | 206 |
207 return 0; | |
208 } | |
209 | |
210 static inline int asv2_decode_block(ASV1Context *a, DCTELEM block[64]){ | |
211 int i, count, ccp; | |
212 | |
213 count= asv2_get_bits(&a->gb, 4); | |
214 | |
215 block[0]= 8*asv2_get_bits(&a->gb, 8); | |
216 | |
217 ccp= get_vlc2(&a->gb, dc_ccp_vlc.table, VLC_BITS, 1); | |
218 if(ccp){ | |
219 if(ccp&4) block[a->scantable.permutated[1]]= (asv2_get_level(&a->gb) * a->intra_matrix[1])>>4; | |
220 if(ccp&2) block[a->scantable.permutated[2]]= (asv2_get_level(&a->gb) * a->intra_matrix[2])>>4; | |
221 if(ccp&1) block[a->scantable.permutated[3]]= (asv2_get_level(&a->gb) * a->intra_matrix[3])>>4; | |
222 } | |
223 | |
224 for(i=1; i<count+1; i++){ | |
225 const int ccp= get_vlc2(&a->gb, ac_ccp_vlc.table, VLC_BITS, 1); | |
226 | |
227 if(ccp){ | |
228 if(ccp&8) block[a->scantable.permutated[4*i+0]]= (asv2_get_level(&a->gb) * a->intra_matrix[4*i+0])>>4; | |
229 if(ccp&4) block[a->scantable.permutated[4*i+1]]= (asv2_get_level(&a->gb) * a->intra_matrix[4*i+1])>>4; | |
230 if(ccp&2) block[a->scantable.permutated[4*i+2]]= (asv2_get_level(&a->gb) * a->intra_matrix[4*i+2])>>4; | |
231 if(ccp&1) block[a->scantable.permutated[4*i+3]]= (asv2_get_level(&a->gb) * a->intra_matrix[4*i+3])>>4; | |
232 } | |
233 } | |
234 | |
130 return 0; | 235 return 0; |
131 } | 236 } |
132 | 237 |
133 static inline void encode_block(ASV1Context *a, DCTELEM block[64]){ | 238 static inline void encode_block(ASV1Context *a, DCTELEM block[64]){ |
134 int i; | 239 int i; |
139 | 244 |
140 for(i=0; i<10; i++){ | 245 for(i=0; i<10; i++){ |
141 const int index= scantab[4*i]; | 246 const int index= scantab[4*i]; |
142 int ccp=0; | 247 int ccp=0; |
143 | 248 |
144 if( (block[index + 0] = (block[index + 0]*a->q_intra_matrix[index + 0] + (1<<15))>>16) ) ccp |= 1; | 249 if( (block[index + 0] = (block[index + 0]*a->q_intra_matrix[index + 0] + (1<<15))>>16) ) ccp |= 8; |
145 if( (block[index + 8] = (block[index + 8]*a->q_intra_matrix[index + 8] + (1<<15))>>16) ) ccp |= 2; | 250 if( (block[index + 8] = (block[index + 8]*a->q_intra_matrix[index + 8] + (1<<15))>>16) ) ccp |= 4; |
146 if( (block[index + 1] = (block[index + 1]*a->q_intra_matrix[index + 1] + (1<<15))>>16) ) ccp |= 4; | 251 if( (block[index + 1] = (block[index + 1]*a->q_intra_matrix[index + 1] + (1<<15))>>16) ) ccp |= 2; |
147 if( (block[index + 9] = (block[index + 9]*a->q_intra_matrix[index + 9] + (1<<15))>>16) ) ccp |= 8; | 252 if( (block[index + 9] = (block[index + 9]*a->q_intra_matrix[index + 9] + (1<<15))>>16) ) ccp |= 1; |
148 | 253 |
149 if(ccp){ | 254 if(ccp){ |
150 for(;nc_count; nc_count--) | 255 for(;nc_count; nc_count--) |
151 put_bits(&a->pb, ccp_tab[0][1], ccp_tab[0][0]); | 256 put_bits(&a->pb, ccp_tab[0][1], ccp_tab[0][0]); |
152 | 257 |
153 put_bits(&a->pb, ccp_tab[ccp][1], ccp_tab[ccp][0]); | 258 put_bits(&a->pb, ccp_tab[ccp][1], ccp_tab[ccp][0]); |
154 | 259 |
155 if(ccp&1) put_level(&a->pb, block[index + 0]); | 260 if(ccp&8) asv1_put_level(&a->pb, block[index + 0]); |
156 if(ccp&2) put_level(&a->pb, block[index + 8]); | 261 if(ccp&4) asv1_put_level(&a->pb, block[index + 8]); |
157 if(ccp&4) put_level(&a->pb, block[index + 1]); | 262 if(ccp&2) asv1_put_level(&a->pb, block[index + 1]); |
158 if(ccp&8) put_level(&a->pb, block[index + 9]); | 263 if(ccp&1) asv1_put_level(&a->pb, block[index + 9]); |
159 }else{ | 264 }else{ |
160 nc_count++; | 265 nc_count++; |
161 } | 266 } |
162 } | 267 } |
163 put_bits(&a->pb, ccp_tab[16][1], ccp_tab[16][0]); | 268 put_bits(&a->pb, ccp_tab[16][1], ccp_tab[16][0]); |
166 static inline int decode_mb(ASV1Context *a, DCTELEM block[6][64]){ | 271 static inline int decode_mb(ASV1Context *a, DCTELEM block[6][64]){ |
167 int i; | 272 int i; |
168 | 273 |
169 a->dsp.clear_blocks(block[0]); | 274 a->dsp.clear_blocks(block[0]); |
170 | 275 |
171 for(i=0; i<6; i++){ | 276 if(a->avctx->codec_id == CODEC_ID_ASV1){ |
172 if( decode_block(a, block[i]) < 0) | 277 for(i=0; i<6; i++){ |
173 return -1; | 278 if( asv1_decode_block(a, block[i]) < 0) |
279 return -1; | |
280 } | |
281 }else{ | |
282 for(i=0; i<6; i++){ | |
283 if( asv2_decode_block(a, block[i]) < 0) | |
284 return -1; | |
285 } | |
174 } | 286 } |
175 return 0; | 287 return 0; |
176 } | 288 } |
177 | 289 |
178 static inline void encode_mb(ASV1Context *a, DCTELEM block[6][64]){ | 290 static inline void encode_mb(ASV1Context *a, DCTELEM block[6][64]){ |
252 } | 364 } |
253 p->pict_type= I_TYPE; | 365 p->pict_type= I_TYPE; |
254 p->key_frame= 1; | 366 p->key_frame= 1; |
255 | 367 |
256 a->bitstream_buffer= av_fast_realloc(a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); | 368 a->bitstream_buffer= av_fast_realloc(a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); |
257 a->dsp.bswap_buf((uint32_t*)a->bitstream_buffer, (uint32_t*)buf, buf_size/4); | 369 |
370 if(avctx->codec_id == CODEC_ID_ASV1) | |
371 a->dsp.bswap_buf((uint32_t*)a->bitstream_buffer, (uint32_t*)buf, buf_size/4); | |
372 else{ | |
373 int i; | |
374 for(i=0; i<buf_size; i++) | |
375 a->bitstream_buffer[i]= reverse[ buf[i] ]; | |
376 } | |
377 | |
258 init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8); | 378 init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8); |
259 | 379 |
260 for(mb_y=0; mb_y<a->mb_height2; mb_y++){ | 380 for(mb_y=0; mb_y<a->mb_height2; mb_y++){ |
261 for(mb_x=0; mb_x<a->mb_width2; mb_x++){ | 381 for(mb_x=0; mb_x<a->mb_width2; mb_x++){ |
262 if( decode_mb(a, a->block) <0) | 382 if( decode_mb(a, a->block) <0) |
377 | 497 |
378 common_init(avctx); | 498 common_init(avctx); |
379 init_vlcs(a); | 499 init_vlcs(a); |
380 ff_init_scantable(a->dsp.idct_permutation, &a->scantable, scantab); | 500 ff_init_scantable(a->dsp.idct_permutation, &a->scantable, scantab); |
381 | 501 |
382 a->inv_qscale= le2me_32(((uint32_t*)avctx->extradata)[0]); | 502 a->inv_qscale= ((uint8_t*)avctx->extradata)[0]; |
383 if(a->inv_qscale == 0){ | 503 if(a->inv_qscale == 0){ |
384 printf("illegal qscale 0\n"); | 504 printf("illegal qscale 0\n"); |
385 a->inv_qscale= 6; | 505 if(avctx->codec_id == CODEC_ID_ASV1) |
506 a->inv_qscale= 6; | |
507 else | |
508 a->inv_qscale= 10; | |
386 } | 509 } |
387 | 510 |
388 for(i=0; i<64; i++){ | 511 for(i=0; i<64; i++){ |
389 int index= scantab[i]; | 512 int index= scantab[i]; |
390 a->intra_matrix[i]= 64*ff_mpeg1_default_intra_matrix[index] / a->inv_qscale; | 513 |
514 if(avctx->codec_id == CODEC_ID_ASV1) | |
515 a->intra_matrix[i]= 64 *ff_mpeg1_default_intra_matrix[index] / a->inv_qscale; | |
516 else | |
517 a->intra_matrix[i]= 128*ff_mpeg1_default_intra_matrix[index] / a->inv_qscale; | |
391 } | 518 } |
392 | 519 |
393 p->qstride= a->mb_width; | 520 p->qstride= a->mb_width; |
394 p->qscale_table= av_mallocz( p->qstride * a->mb_height); | 521 p->qscale_table= av_mallocz( p->qstride * a->mb_height); |
395 | 522 |
441 decode_end, | 568 decode_end, |
442 decode_frame, | 569 decode_frame, |
443 CODEC_CAP_DR1, | 570 CODEC_CAP_DR1, |
444 }; | 571 }; |
445 | 572 |
573 AVCodec asv2_decoder = { | |
574 "asv2", | |
575 CODEC_TYPE_VIDEO, | |
576 CODEC_ID_ASV2, | |
577 sizeof(ASV1Context), | |
578 decode_init, | |
579 NULL, | |
580 decode_end, | |
581 decode_frame, | |
582 CODEC_CAP_DR1, | |
583 }; | |
584 | |
446 #ifdef CONFIG_ENCODERS | 585 #ifdef CONFIG_ENCODERS |
447 | 586 |
448 AVCodec asv1_encoder = { | 587 AVCodec asv1_encoder = { |
449 "asv1", | 588 "asv1", |
450 CODEC_TYPE_VIDEO, | 589 CODEC_TYPE_VIDEO, |