Mercurial > libavcodec.hg
annotate svq3.c @ 7555:8d00a2dfcb7a libavcodec
mlpdec: Split channel parameters from context into their own struct.
| author | ramiro |
|---|---|
| date | Wed, 13 Aug 2008 01:36:01 +0000 |
| parents | 239547e8796e |
| children | 086563096ac5 |
| rev | line source |
|---|---|
| 1234 | 1 /* |
| 2 * Copyright (c) 2003 The FFmpeg Project. | |
| 3 * | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
4 * This file is part of FFmpeg. |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
5 * |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
6 * FFmpeg is free software; you can redistribute it and/or |
| 1234 | 7 * modify it under the terms of the GNU Lesser General Public |
| 8 * License as published by the Free Software Foundation; either | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
9 * version 2.1 of the License, or (at your option) any later version. |
| 1234 | 10 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
11 * FFmpeg is distributed in the hope that it will be useful, |
| 1234 | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 14 * Lesser General Public License for more details. | |
| 15 * | |
| 16 * You should have received a copy of the GNU Lesser General Public | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
17 * License along with FFmpeg; if not, write to the Free Software |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 5215 | 19 */ |
| 20 | |
| 21 /* | |
| 1234 | 22 * How to use this decoder: |
| 23 * SVQ3 data is transported within Apple Quicktime files. Quicktime files | |
|
1235
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
24 * have stsd atoms to describe media trak properties. A stsd atom for a |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
25 * video trak contains 1 or more ImageDescription atoms. These atoms begin |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
26 * with the 4-byte length of the atom followed by the codec fourcc. Some |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
27 * decoders need information in this atom to operate correctly. Such |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
28 * is the case with SVQ3. In order to get the best use out of this decoder, |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
29 * the calling app must make the SVQ3 ImageDescription atom available |
| 1234 | 30 * via the AVCodecContext's extradata[_size] field: |
| 31 * | |
| 2967 | 32 * AVCodecContext.extradata = pointer to ImageDescription, first characters |
|
1235
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
33 * are expected to be 'S', 'V', 'Q', and '3', NOT the 4-byte atom length |
| 2967 | 34 * AVCodecContext.extradata_size = size of ImageDescription atom memory |
| 35 * buffer (which will be the same as the ImageDescription atom size field | |
|
1235
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
36 * from the QT file, minus 4 bytes since the length is missing) |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
37 * |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
38 * You will know you have these parameters passed correctly when the decoder |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
39 * correctly decodes this file: |
|
8bb75c3c2f21
change the way the ImageDescription is passed to the decoder
tmmm
parents:
1234
diff
changeset
|
40 * ftp://ftp.mplayerhq.hu/MPlayer/samples/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov |
| 1234 | 41 */ |
| 2967 | 42 |
| 1234 | 43 /** |
| 44 * @file svq3.c | |
| 45 * svq3 decoder. | |
| 46 */ | |
| 47 | |
| 2967 | 48 #define FULLPEL_MODE 1 |
| 49 #define HALFPEL_MODE 2 | |
| 1265 | 50 #define THIRDPEL_MODE 3 |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
51 #define PREDICT_MODE 4 |
| 2967 | 52 |
| 1252 | 53 /* dual scan (from some older h264 draft) |
| 54 o-->o-->o o | |
| 55 | /| | |
| 56 o o o / o | |
| 57 | / | |/ | | |
| 58 o o o o | |
| 2967 | 59 / |
| 1252 | 60 o-->o-->o-->o |
| 61 */ | |
| 1234 | 62 static const uint8_t svq3_scan[16]={ |
| 63 0+0*4, 1+0*4, 2+0*4, 2+1*4, | |
| 64 2+2*4, 3+0*4, 3+1*4, 3+2*4, | |
| 65 0+1*4, 0+2*4, 1+1*4, 1+2*4, | |
| 66 0+3*4, 1+3*4, 2+3*4, 3+3*4, | |
| 67 }; | |
| 68 | |
| 69 static const uint8_t svq3_pred_0[25][2] = { | |
| 70 { 0, 0 }, | |
| 71 { 1, 0 }, { 0, 1 }, | |
| 72 { 0, 2 }, { 1, 1 }, { 2, 0 }, | |
| 73 { 3, 0 }, { 2, 1 }, { 1, 2 }, { 0, 3 }, | |
| 74 { 0, 4 }, { 1, 3 }, { 2, 2 }, { 3, 1 }, { 4, 0 }, | |
| 75 { 4, 1 }, { 3, 2 }, { 2, 3 }, { 1, 4 }, | |
| 76 { 2, 4 }, { 3, 3 }, { 4, 2 }, | |
| 77 { 4, 3 }, { 3, 4 }, | |
| 78 { 4, 4 } | |
| 79 }; | |
| 80 | |
| 81 static const int8_t svq3_pred_1[6][6][5] = { | |
| 82 { { 2,-1,-1,-1,-1 }, { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, | |
| 83 { 2, 1,-1,-1,-1 }, { 1, 2,-1,-1,-1 }, { 1, 2,-1,-1,-1 } }, | |
| 84 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 4, 3 }, { 0, 1, 2, 4, 3 }, | |
| 85 { 0, 2, 1, 4, 3 }, { 2, 0, 1, 3, 4 }, { 0, 4, 2, 1, 3 } }, | |
| 86 { { 2, 0,-1,-1,-1 }, { 2, 1, 0, 4, 3 }, { 1, 2, 4, 0, 3 }, | |
| 87 { 2, 1, 0, 4, 3 }, { 2, 1, 4, 3, 0 }, { 1, 2, 4, 0, 3 } }, | |
| 88 { { 2, 0,-1,-1,-1 }, { 2, 0, 1, 4, 3 }, { 1, 2, 0, 4, 3 }, | |
| 89 { 2, 1, 0, 4, 3 }, { 2, 1, 3, 4, 0 }, { 2, 4, 1, 0, 3 } }, | |
| 90 { { 0, 2,-1,-1,-1 }, { 0, 2, 1, 3, 4 }, { 1, 2, 3, 0, 4 }, | |
| 91 { 2, 0, 1, 3, 4 }, { 2, 1, 3, 0, 4 }, { 2, 0, 4, 3, 1 } }, | |
| 92 { { 0, 2,-1,-1,-1 }, { 0, 2, 4, 1, 3 }, { 1, 4, 2, 0, 3 }, | |
| 93 { 4, 2, 0, 1, 3 }, { 2, 0, 1, 4, 3 }, { 4, 2, 1, 0, 3 } }, | |
| 94 }; | |
| 95 | |
| 96 static const struct { uint8_t run; uint8_t level; } svq3_dct_tables[2][16] = { | |
| 97 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 3, 1 }, { 4, 1 }, { 5, 1 }, | |
| 98 { 0, 3 }, { 1, 2 }, { 2, 2 }, { 6, 1 }, { 7, 1 }, { 8, 1 }, { 9, 1 }, { 0, 4 } }, | |
| 99 { { 0, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 2, 1 }, { 0, 3 }, { 0, 4 }, { 0, 5 }, | |
| 100 { 3, 1 }, { 4, 1 }, { 1, 2 }, { 1, 3 }, { 0, 6 }, { 0, 7 }, { 0, 8 }, { 0, 9 } } | |
| 101 }; | |
| 102 | |
| 103 static const uint32_t svq3_dequant_coeff[32] = { | |
| 104 3881, 4351, 4890, 5481, 6154, 6914, 7761, 8718, | |
| 105 9781, 10987, 12339, 13828, 15523, 17435, 19561, 21873, | |
| 106 24552, 27656, 30847, 34870, 38807, 43747, 49103, 54683, | |
| 107 61694, 68745, 77615, 89113,100253,109366,126635,141533 | |
| 108 }; | |
| 109 | |
| 110 | |
| 111 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 112 const int qmul= svq3_dequant_coeff[qp]; | |
| 113 #define stride 16 | |
| 114 int i; | |
| 115 int temp[16]; | |
| 116 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 117 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 118 | |
| 119 for(i=0; i<4; i++){ | |
| 120 const int offset= y_offset[i]; | |
| 121 const int z0= 13*(block[offset+stride*0] + block[offset+stride*4]); | |
| 122 const int z1= 13*(block[offset+stride*0] - block[offset+stride*4]); | |
| 123 const int z2= 7* block[offset+stride*1] - 17*block[offset+stride*5]; | |
| 124 const int z3= 17* block[offset+stride*1] + 7*block[offset+stride*5]; | |
| 125 | |
| 126 temp[4*i+0]= z0+z3; | |
| 127 temp[4*i+1]= z1+z2; | |
| 128 temp[4*i+2]= z1-z2; | |
| 129 temp[4*i+3]= z0-z3; | |
| 130 } | |
| 131 | |
| 132 for(i=0; i<4; i++){ | |
| 133 const int offset= x_offset[i]; | |
| 134 const int z0= 13*(temp[4*0+i] + temp[4*2+i]); | |
| 135 const int z1= 13*(temp[4*0+i] - temp[4*2+i]); | |
| 136 const int z2= 7* temp[4*1+i] - 17*temp[4*3+i]; | |
| 137 const int z3= 17* temp[4*1+i] + 7*temp[4*3+i]; | |
| 138 | |
| 139 block[stride*0 +offset]= ((z0 + z3)*qmul + 0x80000)>>20; | |
| 140 block[stride*2 +offset]= ((z1 + z2)*qmul + 0x80000)>>20; | |
| 141 block[stride*8 +offset]= ((z1 - z2)*qmul + 0x80000)>>20; | |
| 142 block[stride*10+offset]= ((z0 - z3)*qmul + 0x80000)>>20; | |
| 143 } | |
| 144 } | |
| 145 #undef stride | |
| 146 | |
| 147 static void svq3_add_idct_c (uint8_t *dst, DCTELEM *block, int stride, int qp, int dc){ | |
| 148 const int qmul= svq3_dequant_coeff[qp]; | |
| 149 int i; | |
| 4176 | 150 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; |
| 1234 | 151 |
| 152 if (dc) { | |
| 153 dc = 13*13*((dc == 1) ? 1538*block[0] : ((qmul*(block[0] >> 3)) / 2)); | |
| 154 block[0] = 0; | |
| 155 } | |
| 156 | |
| 157 for (i=0; i < 4; i++) { | |
| 158 const int z0= 13*(block[0 + 4*i] + block[2 + 4*i]); | |
| 159 const int z1= 13*(block[0 + 4*i] - block[2 + 4*i]); | |
| 160 const int z2= 7* block[1 + 4*i] - 17*block[3 + 4*i]; | |
| 161 const int z3= 17* block[1 + 4*i] + 7*block[3 + 4*i]; | |
| 162 | |
| 163 block[0 + 4*i]= z0 + z3; | |
| 164 block[1 + 4*i]= z1 + z2; | |
| 165 block[2 + 4*i]= z1 - z2; | |
| 166 block[3 + 4*i]= z0 - z3; | |
| 167 } | |
| 168 | |
| 169 for (i=0; i < 4; i++) { | |
| 170 const int z0= 13*(block[i + 4*0] + block[i + 4*2]); | |
| 171 const int z1= 13*(block[i + 4*0] - block[i + 4*2]); | |
| 172 const int z2= 7* block[i + 4*1] - 17*block[i + 4*3]; | |
| 173 const int z3= 17* block[i + 4*1] + 7*block[i + 4*3]; | |
| 174 const int rr= (dc + 0x80000); | |
| 175 | |
| 176 dst[i + stride*0]= cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ]; | |
| 177 dst[i + stride*1]= cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ]; | |
| 178 dst[i + stride*2]= cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ]; | |
| 179 dst[i + stride*3]= cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ]; | |
| 180 } | |
| 181 } | |
| 182 | |
| 183 static inline int svq3_decode_block (GetBitContext *gb, DCTELEM *block, | |
| 2979 | 184 int index, const int type) { |
| 1234 | 185 |
| 186 static const uint8_t *const scan_patterns[4] = | |
| 187 { luma_dc_zigzag_scan, zigzag_scan, svq3_scan, chroma_dc_scan }; | |
| 188 | |
| 189 int run, level, sign, vlc, limit; | |
| 190 const int intra = (3 * type) >> 2; | |
| 191 const uint8_t *const scan = scan_patterns[type]; | |
| 192 | |
| 193 for (limit=(16 >> intra); index < 16; index=limit, limit+=8) { | |
| 194 for (; (vlc = svq3_get_ue_golomb (gb)) != 0; index++) { | |
| 195 | |
| 196 if (vlc == INVALID_VLC) | |
| 2979 | 197 return -1; |
| 1234 | 198 |
| 199 sign = (vlc & 0x1) - 1; | |
| 200 vlc = (vlc + 1) >> 1; | |
| 201 | |
| 202 if (type == 3) { | |
| 2979 | 203 if (vlc < 3) { |
| 204 run = 0; | |
| 205 level = vlc; | |
| 206 } else if (vlc < 4) { | |
| 207 run = 1; | |
| 208 level = 1; | |
| 209 } else { | |
| 210 run = (vlc & 0x3); | |
| 211 level = ((vlc + 9) >> 2) - run; | |
| 212 } | |
| 1234 | 213 } else { |
| 2979 | 214 if (vlc < 16) { |
| 215 run = svq3_dct_tables[intra][vlc].run; | |
| 216 level = svq3_dct_tables[intra][vlc].level; | |
| 217 } else if (intra) { | |
| 218 run = (vlc & 0x7); | |
| 219 level = (vlc >> 3) + ((run == 0) ? 8 : ((run < 2) ? 2 : ((run < 5) ? 0 : -1))); | |
| 220 } else { | |
| 221 run = (vlc & 0xF); | |
| 222 level = (vlc >> 4) + ((run == 0) ? 4 : ((run < 3) ? 2 : ((run < 10) ? 1 : 0))); | |
| 223 } | |
| 1234 | 224 } |
| 225 | |
| 226 if ((index += run) >= limit) | |
| 2979 | 227 return -1; |
| 1234 | 228 |
| 229 block[scan[index]] = (level ^ sign) - sign; | |
| 230 } | |
| 231 | |
| 232 if (type != 2) { | |
| 233 break; | |
| 234 } | |
| 235 } | |
| 236 | |
| 237 return 0; | |
| 238 } | |
| 239 | |
| 1319 | 240 static inline void svq3_mc_dir_part (MpegEncContext *s, |
| 2979 | 241 int x, int y, int width, int height, |
| 242 int mx, int my, int dxy, | |
| 243 int thirdpel, int dir, int avg) { | |
| 1319 | 244 |
| 245 const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture; | |
| 1234 | 246 uint8_t *src, *dest; |
| 247 int i, emu = 0; | |
|
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
248 int blocksize= 2 - (width>>3); //16->0, 8->1, 4->2 |
| 1234 | 249 |
| 1265 | 250 mx += x; |
| 251 my += y; | |
| 2967 | 252 |
| 1268 | 253 if (mx < 0 || mx >= (s->h_edge_pos - width - 1) || |
| 254 my < 0 || my >= (s->v_edge_pos - height - 1)) { | |
| 1234 | 255 |
| 256 if ((s->flags & CODEC_FLAG_EMU_EDGE)) { | |
| 257 emu = 1; | |
| 258 } | |
| 259 | |
| 4594 | 260 mx = av_clip (mx, -16, (s->h_edge_pos - width + 15)); |
| 261 my = av_clip (my, -16, (s->v_edge_pos - height + 15)); | |
| 1234 | 262 } |
| 263 | |
| 264 /* form component predictions */ | |
| 265 dest = s->current_picture.data[0] + x + y*s->linesize; | |
| 1319 | 266 src = pic->data[0] + mx + my*s->linesize; |
| 1234 | 267 |
| 268 if (emu) { | |
| 1321 | 269 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1), |
| 2979 | 270 mx, my, s->h_edge_pos, s->v_edge_pos); |
| 1234 | 271 src = s->edge_emu_buffer; |
| 272 } | |
|
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
273 if(thirdpel) |
| 1319 | 274 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height); |
|
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
275 else |
| 1319 | 276 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height); |
| 1234 | 277 |
| 278 if (!(s->flags & CODEC_FLAG_GRAY)) { | |
| 2979 | 279 mx = (mx + (mx < (int) x)) >> 1; |
| 280 my = (my + (my < (int) y)) >> 1; | |
| 1234 | 281 width = (width >> 1); |
| 282 height = (height >> 1); | |
|
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
283 blocksize++; |
| 1234 | 284 |
| 285 for (i=1; i < 3; i++) { | |
| 286 dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize; | |
| 1319 | 287 src = pic->data[i] + mx + my*s->uvlinesize; |
| 1234 | 288 |
| 289 if (emu) { | |
| 1321 | 290 ff_emulated_edge_mc (s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1), |
| 2979 | 291 mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1)); |
| 1321 | 292 src = s->edge_emu_buffer; |
| 1234 | 293 } |
|
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
294 if(thirdpel) |
| 1319 | 295 (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height); |
|
1267
85b71f9f7450
moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
michaelni
parents:
1265
diff
changeset
|
296 else |
| 1319 | 297 (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height); |
| 1234 | 298 } |
| 299 } | |
| 300 } | |
| 301 | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
302 static inline int svq3_mc_dir (H264Context *h, int size, int mode, int dir, int avg) { |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
303 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
304 int i, j, k, mx, my, dx, dy, x, y; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
305 MpegEncContext *const s = (MpegEncContext *) h; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
306 const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1); |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
307 const int part_height = 16 >> ((unsigned) (size + 1) / 3); |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
308 const int extra_width = (mode == PREDICT_MODE) ? -16*6 : 0; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
309 const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
310 const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
311 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
312 for (i=0; i < 16; i+=part_height) { |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
313 for (j=0; j < 16; j+=part_width) { |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
314 const int b_xy = (4*s->mb_x+(j>>2)) + (4*s->mb_y+(i>>2))*h->b_stride; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
315 int dxy; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
316 x = 16*s->mb_x + j; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
317 y = 16*s->mb_y + i; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
318 k = ((j>>2)&1) + ((i>>1)&2) + ((j>>1)&4) + (i&8); |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
319 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
320 if (mode != PREDICT_MODE) { |
| 2979 | 321 pred_motion (h, k, (part_width >> 2), dir, 1, &mx, &my); |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
322 } else { |
| 2979 | 323 mx = s->next_picture.motion_val[0][b_xy][0]<<1; |
| 324 my = s->next_picture.motion_val[0][b_xy][1]<<1; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
325 |
| 2979 | 326 if (dir == 0) { |
| 327 mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1; | |
| 328 my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1; | |
| 329 } else { | |
| 330 mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; | |
| 331 my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; | |
| 332 } | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
333 } |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
334 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
335 /* clip motion vector prediction to frame border */ |
| 4594 | 336 mx = av_clip (mx, extra_width - 6*x, h_edge_pos - 6*x); |
| 337 my = av_clip (my, extra_width - 6*y, v_edge_pos - 6*y); | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
338 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
339 /* get (optional) motion vector differential */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
340 if (mode == PREDICT_MODE) { |
| 2979 | 341 dx = dy = 0; |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
342 } else { |
| 2979 | 343 dy = svq3_get_se_golomb (&s->gb); |
| 344 dx = svq3_get_se_golomb (&s->gb); | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
345 |
| 2979 | 346 if (dx == INVALID_VLC || dy == INVALID_VLC) { |
| 2452 | 347 av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n"); |
| 2979 | 348 return -1; |
| 349 } | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
350 } |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
351 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
352 /* compute motion vector */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
353 if (mode == THIRDPEL_MODE) { |
| 2979 | 354 int fx, fy; |
| 355 mx = ((mx + 1)>>1) + dx; | |
| 356 my = ((my + 1)>>1) + dy; | |
| 357 fx= ((unsigned)(mx + 0x3000))/3 - 0x1000; | |
| 358 fy= ((unsigned)(my + 0x3000))/3 - 0x1000; | |
| 359 dxy= (mx - 3*fx) + 4*(my - 3*fy); | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
360 |
| 2979 | 361 svq3_mc_dir_part (s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg); |
| 362 mx += mx; | |
| 363 my += my; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
364 } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) { |
| 2979 | 365 mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000; |
| 366 my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000; | |
| 367 dxy= (mx&1) + 2*(my&1); | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
368 |
| 2979 | 369 svq3_mc_dir_part (s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg); |
| 370 mx *= 3; | |
| 371 my *= 3; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
372 } else { |
| 2979 | 373 mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000; |
| 374 my = ((unsigned)(my + 3 + 0x6000))/6 + dy - 0x1000; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
375 |
| 2979 | 376 svq3_mc_dir_part (s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg); |
| 377 mx *= 6; | |
| 378 my *= 6; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
379 } |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
380 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
381 /* update mv_cache */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
382 if (mode != PREDICT_MODE) { |
| 2979 | 383 int32_t mv = pack16to32(mx,my); |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
384 |
| 2979 | 385 if (part_height == 8 && i < 8) { |
| 386 *(int32_t *) h->mv_cache[dir][scan8[k] + 1*8] = mv; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
387 |
| 2979 | 388 if (part_width == 8 && j < 8) { |
| 389 *(int32_t *) h->mv_cache[dir][scan8[k] + 1 + 1*8] = mv; | |
| 390 } | |
| 391 } | |
| 392 if (part_width == 8 && j < 8) { | |
| 393 *(int32_t *) h->mv_cache[dir][scan8[k] + 1] = mv; | |
| 394 } | |
| 395 if (part_width == 4 || part_height == 4) { | |
| 396 *(int32_t *) h->mv_cache[dir][scan8[k]] = mv; | |
| 397 } | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
398 } |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
399 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
400 /* write back motion vectors */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
401 fill_rectangle(s->current_picture.motion_val[dir][b_xy], part_width>>2, part_height>>2, h->b_stride, pack16to32(mx,my), 4); |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
402 } |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
403 } |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
404 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
405 return 0; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
406 } |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
407 |
| 1234 | 408 static int svq3_decode_mb (H264Context *h, unsigned int mb_type) { |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
409 int i, j, k, m, dir, mode; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
410 int cbp = 0; |
| 1234 | 411 uint32_t vlc; |
| 412 int8_t *top, *left; | |
| 413 MpegEncContext *const s = (MpegEncContext *) h; | |
| 6787 | 414 const int mb_xy = h->mb_xy; |
| 1234 | 415 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; |
| 416 | |
| 2979 | 417 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; |
| 418 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; | |
| 419 h->topright_samples_available = 0xFFFF; | |
| 1234 | 420 |
| 2979 | 421 if (mb_type == 0) { /* SKIP */ |
| 6481 | 422 if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) { |
| 1319 | 423 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0); |
| 424 | |
| 6481 | 425 if (s->pict_type == FF_B_TYPE) { |
| 2979 | 426 svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1); |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
427 } |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
428 |
| 1319 | 429 mb_type = MB_TYPE_SKIP; |
| 430 } else { | |
|
2088
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
431 mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 6); |
|
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
432 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0) < 0) |
|
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
433 return -1; |
|
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
434 if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1) < 0) |
|
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
435 return -1; |
| 1319 | 436 |
| 437 mb_type = MB_TYPE_16x16; | |
| 438 } | |
| 2979 | 439 } else if (mb_type < 8) { /* INTER */ |
| 5513 | 440 if (h->thirdpel_flag && h->halfpel_flag == !get_bits1 (&s->gb)) { |
| 1265 | 441 mode = THIRDPEL_MODE; |
| 5513 | 442 } else if (h->halfpel_flag && h->thirdpel_flag == !get_bits1 (&s->gb)) { |
| 1265 | 443 mode = HALFPEL_MODE; |
| 1234 | 444 } else { |
| 1265 | 445 mode = FULLPEL_MODE; |
| 1234 | 446 } |
| 447 | |
| 448 /* fill caches */ | |
| 1319 | 449 /* note ref_cache should contain here: |
| 1252 | 450 ???????? |
| 451 ???11111 | |
| 452 N??11111 | |
| 453 N??11111 | |
| 454 N??11111 | |
| 455 */ | |
| 2967 | 456 |
| 1319 | 457 for (m=0; m < 2; m++) { |
| 458 if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) { | |
| 2979 | 459 for (i=0; i < 4; i++) { |
| 460 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - 1 + i*h->b_stride]; | |
| 461 } | |
| 1319 | 462 } else { |
| 2979 | 463 for (i=0; i < 4; i++) { |
| 464 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0; | |
| 465 } | |
| 1234 | 466 } |
| 1319 | 467 if (s->mb_y > 0) { |
| 2979 | 468 memcpy (h->mv_cache[m][scan8[0] - 1*8], s->current_picture.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t)); |
| 469 memset (&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1, 4); | |
| 1234 | 470 |
| 2979 | 471 if (s->mb_x < (s->mb_width - 1)) { |
| 472 *(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride + 4]; | |
| 473 h->ref_cache[m][scan8[0] + 4 - 1*8] = | |
| 474 (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 || | |
| 475 h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1; | |
| 476 }else | |
| 477 h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE; | |
| 478 if (s->mb_x > 0) { | |
| 479 *(uint32_t *) h->mv_cache[m][scan8[0] - 1 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride - 1]; | |
| 480 h->ref_cache[m][scan8[0] - 1 - 1*8] = (h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] == -1) ? PART_NOT_AVAILABLE : 1; | |
| 481 }else | |
| 482 h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE; | |
| 1252 | 483 }else |
| 2979 | 484 memset (&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8); |
| 1319 | 485 |
| 6481 | 486 if (s->pict_type != FF_B_TYPE) |
| 2979 | 487 break; |
| 1319 | 488 } |
| 1234 | 489 |
| 490 /* decode motion vector(s) and form prediction(s) */ | |
| 6481 | 491 if (s->pict_type == FF_P_TYPE) { |
|
2088
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
492 if(svq3_mc_dir (h, (mb_type - 1), mode, 0, 0) < 0) |
|
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
493 return -1; |
| 6481 | 494 } else { /* FF_B_TYPE */ |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
495 if (mb_type != 2) { |
| 2979 | 496 if(svq3_mc_dir (h, 0, mode, 0, 0) < 0) |
|
2088
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
497 return -1; |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
498 } else { |
| 2979 | 499 for (i=0; i < 4; i++) { |
| 500 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | |
| 501 } | |
| 1234 | 502 } |
| 1319 | 503 if (mb_type != 1) { |
| 2979 | 504 if(svq3_mc_dir (h, 0, mode, 1, (mb_type == 3)) < 0) |
|
2088
19d4d5c6a8f4
1000l to myself for FFMIN(...,0) instead of ...,6)
michael
parents:
2086
diff
changeset
|
505 return -1; |
| 1319 | 506 } else { |
| 2979 | 507 for (i=0; i < 4; i++) { |
| 508 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | |
| 509 } | |
| 1319 | 510 } |
| 1234 | 511 } |
| 512 | |
| 513 mb_type = MB_TYPE_16x16; | |
| 2979 | 514 } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */ |
| 1234 | 515 memset (h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t)); |
| 516 | |
| 1319 | 517 if (mb_type == 8) { |
| 518 if (s->mb_x > 0) { | |
| 2979 | 519 for (i=0; i < 4; i++) { |
| 520 h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i]; | |
| 521 } | |
| 522 if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) { | |
| 523 h->left_samples_available = 0x5F5F; | |
| 524 } | |
| 1234 | 525 } |
| 1319 | 526 if (s->mb_y > 0) { |
| 2979 | 527 h->intra4x4_pred_mode_cache[4+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][4]; |
| 528 h->intra4x4_pred_mode_cache[5+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][5]; | |
| 529 h->intra4x4_pred_mode_cache[6+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][6]; | |
| 530 h->intra4x4_pred_mode_cache[7+8*0] = h->intra4x4_pred_mode[mb_xy - s->mb_stride][3]; | |
| 1319 | 531 |
| 2979 | 532 if (h->intra4x4_pred_mode_cache[4+8*0] == -1) { |
| 533 h->top_samples_available = 0x33FF; | |
| 534 } | |
| 1319 | 535 } |
| 1234 | 536 |
| 1319 | 537 /* decode prediction codes for luma blocks */ |
| 538 for (i=0; i < 16; i+=2) { | |
| 2979 | 539 vlc = svq3_get_ue_golomb (&s->gb); |
| 1234 | 540 |
| 2979 | 541 if (vlc >= 25){ |
| 2452 | 542 av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc); |
| 2979 | 543 return -1; |
| 2452 | 544 } |
| 1319 | 545 |
| 2979 | 546 left = &h->intra4x4_pred_mode_cache[scan8[i] - 1]; |
| 547 top = &h->intra4x4_pred_mode_cache[scan8[i] - 8]; | |
| 1234 | 548 |
| 2979 | 549 left[1] = svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]]; |
| 550 left[2] = svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]]; | |
| 1234 | 551 |
| 2979 | 552 if (left[1] == -1 || left[2] == -1){ |
| 2452 | 553 av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n"); |
| 2979 | 554 return -1; |
| 2452 | 555 } |
| 1319 | 556 } |
| 2979 | 557 } else { /* mb_type == 33, DC_128_PRED block type */ |
| 1319 | 558 for (i=0; i < 4; i++) { |
| 2979 | 559 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4); |
| 1319 | 560 } |
| 1234 | 561 } |
| 562 | |
| 563 write_back_intra_pred_mode (h); | |
| 1319 | 564 |
| 565 if (mb_type == 8) { | |
| 566 check_intra4x4_pred_mode (h); | |
| 567 | |
| 568 h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; | |
| 569 h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; | |
| 570 } else { | |
| 571 for (i=0; i < 4; i++) { | |
| 572 memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4); | |
| 573 } | |
| 574 | |
| 575 h->top_samples_available = 0x33FF; | |
| 576 h->left_samples_available = 0x5F5F; | |
| 577 } | |
| 1234 | 578 |
| 579 mb_type = MB_TYPE_INTRA4x4; | |
| 2979 | 580 } else { /* INTRA16x16 */ |
| 1234 | 581 dir = i_mb_type_info[mb_type - 8].pred_mode; |
| 582 dir = (dir >> 1) ^ 3*(dir & 1) ^ 1; | |
| 583 | |
| 2452 | 584 if ((h->intra16x16_pred_mode = check_intra_pred_mode (h, dir)) == -1){ |
| 585 av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n"); | |
| 1234 | 586 return -1; |
| 2452 | 587 } |
| 1234 | 588 |
| 589 cbp = i_mb_type_info[mb_type - 8].cbp; | |
| 590 mb_type = MB_TYPE_INTRA16x16; | |
| 591 } | |
| 592 | |
| 6481 | 593 if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) { |
| 1234 | 594 for (i=0; i < 4; i++) { |
| 595 memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); | |
| 596 } | |
| 6481 | 597 if (s->pict_type == FF_B_TYPE) { |
| 1319 | 598 for (i=0; i < 4; i++) { |
| 2979 | 599 memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); |
| 1319 | 600 } |
| 601 } | |
| 1234 | 602 } |
| 603 if (!IS_INTRA4x4(mb_type)) { | |
| 604 memset (h->intra4x4_pred_mode[mb_xy], DC_PRED, 8); | |
| 605 } | |
| 6481 | 606 if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) { |
| 1252 | 607 memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t)); |
| 608 s->dsp.clear_blocks(h->mb); | |
| 1234 | 609 } |
| 610 | |
| 6481 | 611 if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) { |
| 2452 | 612 if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48){ |
| 613 av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
614 return -1; |
| 2452 | 615 } |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
616 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
617 cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc]; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
618 } |
| 6481 | 619 if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) { |
| 1234 | 620 s->qscale += svq3_get_se_golomb (&s->gb); |
| 621 | |
| 2452 | 622 if (s->qscale > 31){ |
| 623 av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale); | |
| 1234 | 624 return -1; |
| 2452 | 625 } |
| 1234 | 626 } |
| 627 if (IS_INTRA16x16(mb_type)) { | |
| 2452 | 628 if (svq3_decode_block (&s->gb, h->mb, 0, 0)){ |
| 629 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); | |
| 1234 | 630 return -1; |
| 2452 | 631 } |
| 1234 | 632 } |
| 633 | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
634 if (cbp) { |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
635 const int index = IS_INTRA16x16(mb_type) ? 1 : 0; |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
636 const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1); |
| 1234 | 637 |
| 638 for (i=0; i < 4; i++) { | |
| 639 if ((cbp & (1 << i))) { | |
| 2979 | 640 for (j=0; j < 4; j++) { |
| 641 k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j); | |
| 642 h->non_zero_count_cache[ scan8[k] ] = 1; | |
| 1234 | 643 |
| 2979 | 644 if (svq3_decode_block (&s->gb, &h->mb[16*k], index, type)){ |
| 2452 | 645 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n"); |
| 2979 | 646 return -1; |
| 2452 | 647 } |
| 2979 | 648 } |
| 1234 | 649 } |
| 650 } | |
| 651 | |
| 652 if ((cbp & 0x30)) { | |
| 653 for (i=0; i < 2; ++i) { | |
| 2979 | 654 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){ |
| 2452 | 655 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); |
| 2979 | 656 return -1; |
| 2452 | 657 } |
| 1234 | 658 } |
| 659 | |
| 660 if ((cbp & 0x20)) { | |
| 2979 | 661 for (i=0; i < 8; i++) { |
| 662 h->non_zero_count_cache[ scan8[16+i] ] = 1; | |
| 1234 | 663 |
| 2979 | 664 if (svq3_decode_block (&s->gb, &h->mb[16*(16 + i)], 1, 1)){ |
| 2452 | 665 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); |
| 2979 | 666 return -1; |
| 2452 | 667 } |
| 2979 | 668 } |
| 1234 | 669 } |
| 670 } | |
| 671 } | |
| 672 | |
| 673 s->current_picture.mb_type[mb_xy] = mb_type; | |
| 674 | |
| 675 if (IS_INTRA(mb_type)) { | |
| 676 h->chroma_pred_mode = check_intra_pred_mode (h, DC_PRED8x8); | |
| 677 } | |
| 678 | |
| 679 return 0; | |
| 680 } | |
| 681 | |
| 1319 | 682 static int svq3_decode_slice_header (H264Context *h) { |
| 683 MpegEncContext *const s = (MpegEncContext *) h; | |
|
6789
8107e891b226
Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents:
6787
diff
changeset
|
684 const int mb_xy = h->mb_xy; |
| 1319 | 685 int i, header; |
| 686 | |
| 687 header = get_bits (&s->gb, 8); | |
| 688 | |
| 689 if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) { | |
| 690 /* TODO: what? */ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1330
diff
changeset
|
691 av_log(h->s.avctx, AV_LOG_ERROR, "unsupported slice header (%02X)\n", header); |
| 1319 | 692 return -1; |
| 693 } else { | |
| 694 int length = (header >> 5) & 3; | |
| 695 | |
|
2614
5e24800ab329
various fixes related to the non alt_bitstream_reader
michael
parents:
2453
diff
changeset
|
696 h->next_slice_index = get_bits_count(&s->gb) + 8*show_bits (&s->gb, 8*length) + 8*length; |
| 1319 | 697 |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
698 if (h->next_slice_index > s->gb.size_in_bits){ |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
699 av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n"); |
| 1319 | 700 return -1; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
701 } |
| 1319 | 702 |
| 703 s->gb.size_in_bits = h->next_slice_index - 8*(length - 1); | |
|
2614
5e24800ab329
various fixes related to the non alt_bitstream_reader
michael
parents:
2453
diff
changeset
|
704 skip_bits(&s->gb, 8); |
| 1319 | 705 |
| 706 if (length > 0) { | |
| 7291 | 707 memcpy ((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3], |
| 1319 | 708 &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1)); |
| 709 } | |
| 710 } | |
| 711 | |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
712 if ((i = svq3_get_ue_golomb (&s->gb)) == INVALID_VLC || i >= 3){ |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
713 av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i); |
| 1319 | 714 return -1; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
715 } |
| 1319 | 716 |
| 717 h->slice_type = golomb_to_pict_type[i]; | |
| 718 | |
| 719 if ((header & 0x9F) == 2) { | |
| 720 i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1)); | |
| 721 s->mb_skip_run = get_bits (&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width)); | |
| 722 } else { | |
| 5519 | 723 skip_bits1 (&s->gb); |
| 1319 | 724 s->mb_skip_run = 0; |
| 725 } | |
| 726 | |
| 727 h->slice_num = get_bits (&s->gb, 8); | |
| 728 s->qscale = get_bits (&s->gb, 5); | |
| 729 s->adaptive_quant = get_bits1 (&s->gb); | |
| 730 | |
| 731 /* unknown fields */ | |
| 5519 | 732 skip_bits1 (&s->gb); |
| 1319 | 733 |
| 734 if (h->unknown_svq3_flag) { | |
| 5519 | 735 skip_bits1 (&s->gb); |
| 1319 | 736 } |
| 737 | |
| 5519 | 738 skip_bits1 (&s->gb); |
| 739 skip_bits (&s->gb, 2); | |
| 1319 | 740 |
| 741 while (get_bits1 (&s->gb)) { | |
| 5519 | 742 skip_bits (&s->gb, 8); |
| 1319 | 743 } |
| 744 | |
| 745 /* reset intra predictors and invalidate motion vector references */ | |
| 746 if (s->mb_x > 0) { | |
| 747 memset (h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t)); | |
| 748 memset (h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x); | |
| 749 } | |
| 750 if (s->mb_y > 0) { | |
| 751 memset (h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); | |
| 752 | |
| 753 if (s->mb_x > 0) { | |
| 754 h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1; | |
| 755 } | |
| 756 } | |
| 757 | |
| 758 return 0; | |
| 759 } | |
| 760 | |
| 1234 | 761 static int svq3_decode_frame (AVCodecContext *avctx, |
| 2979 | 762 void *data, int *data_size, |
| 6216 | 763 const uint8_t *buf, int buf_size) { |
| 1234 | 764 MpegEncContext *const s = avctx->priv_data; |
| 765 H264Context *const h = avctx->priv_data; | |
| 1319 | 766 int m, mb_type; |
|
1877
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
767 unsigned char *extradata; |
|
1878
838c18d1e7fc
be smarter about the variable size of the extra SVQ3 data
melanson
parents:
1877
diff
changeset
|
768 unsigned int size; |
| 1319 | 769 |
| 1234 | 770 s->flags = avctx->flags; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1699
diff
changeset
|
771 s->flags2 = avctx->flags2; |
| 1699 | 772 s->unrestricted_mv = 1; |
| 773 | |
| 1234 | 774 if (!s->context_initialized) { |
| 1268 | 775 s->width = avctx->width; |
| 776 s->height = avctx->height; | |
| 1234 | 777 h->halfpel_flag = 1; |
| 778 h->thirdpel_flag = 1; | |
| 1319 | 779 h->unknown_svq3_flag = 0; |
|
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5215
diff
changeset
|
780 h->chroma_qp[0] = h->chroma_qp[1] = 4; |
| 1234 | 781 |
| 782 if (MPV_common_init (s) < 0) | |
| 783 return -1; | |
| 784 | |
| 1268 | 785 h->b_stride = 4*s->mb_width; |
| 786 | |
| 1234 | 787 alloc_tables (h); |
| 1319 | 788 |
|
1877
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
789 /* prowl for the "SEQH" marker in the extradata */ |
|
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
790 extradata = (unsigned char *)avctx->extradata; |
|
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
791 for (m = 0; m < avctx->extradata_size; m++) { |
|
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
792 if (!memcmp (extradata, "SEQH", 4)) |
|
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
793 break; |
|
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
794 extradata++; |
|
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
795 } |
|
1878
838c18d1e7fc
be smarter about the variable size of the extra SVQ3 data
melanson
parents:
1877
diff
changeset
|
796 |
|
1877
869256817a91
smarten up the SVQ3 extradata decoder without changing the external API
melanson
parents:
1754
diff
changeset
|
797 /* if a match was found, parse the extra data */ |
|
4392
e0c94f1b8f55
maybe fix segfault with missing extradata (unchecked)
michael
parents:
4364
diff
changeset
|
798 if (extradata && !memcmp (extradata, "SEQH", 4)) { |
| 1319 | 799 |
| 800 GetBitContext gb; | |
| 1234 | 801 |
| 4364 | 802 size = AV_RB32(&extradata[4]); |
|
2966
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2792
diff
changeset
|
803 init_get_bits (&gb, extradata + 8, size*8); |
| 1234 | 804 |
| 1319 | 805 /* 'frame size code' and optional 'width, height' */ |
| 806 if (get_bits (&gb, 3) == 7) { | |
| 5519 | 807 skip_bits (&gb, 12); |
| 808 skip_bits (&gb, 12); | |
| 1234 | 809 } |
| 810 | |
| 1319 | 811 h->halfpel_flag = get_bits1 (&gb); |
| 812 h->thirdpel_flag = get_bits1 (&gb); | |
| 813 | |
| 814 /* unknown fields */ | |
| 5519 | 815 skip_bits1 (&gb); |
| 816 skip_bits1 (&gb); | |
| 817 skip_bits1 (&gb); | |
| 818 skip_bits1 (&gb); | |
| 1319 | 819 |
| 820 s->low_delay = get_bits1 (&gb); | |
| 821 | |
| 822 /* unknown field */ | |
| 5519 | 823 skip_bits1 (&gb); |
| 1319 | 824 |
| 825 while (get_bits1 (&gb)) { | |
| 5519 | 826 skip_bits (&gb, 8); |
| 1319 | 827 } |
| 828 | |
| 829 h->unknown_svq3_flag = get_bits1 (&gb); | |
| 830 avctx->has_b_frames = !s->low_delay; | |
| 1234 | 831 } |
| 832 } | |
| 833 | |
| 1319 | 834 /* special case for last picture */ |
| 835 if (buf_size == 0) { | |
| 836 if (s->next_picture_ptr && !s->low_delay) { | |
| 837 *(AVFrame *) data = *(AVFrame *) &s->next_picture; | |
| 7276 | 838 s->next_picture_ptr= NULL; |
| 1319 | 839 *data_size = sizeof(AVFrame); |
| 1234 | 840 } |
| 1319 | 841 return 0; |
| 1234 | 842 } |
| 843 | |
| 1319 | 844 init_get_bits (&s->gb, buf, 8*buf_size); |
| 1234 | 845 |
|
6789
8107e891b226
Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents:
6787
diff
changeset
|
846 s->mb_x = s->mb_y = h->mb_xy = 0; |
| 1319 | 847 |
| 848 if (svq3_decode_slice_header (h)) | |
| 1234 | 849 return -1; |
| 850 | |
| 1319 | 851 s->pict_type = h->slice_type; |
| 852 s->picture_number = h->slice_num; | |
| 1234 | 853 |
| 1250 | 854 if(avctx->debug&FF_DEBUG_PICT_INFO){ |
| 7287 | 855 av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", |
| 1264 | 856 av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag, |
| 7287 | 857 s->adaptive_quant, s->qscale, h->slice_num |
| 1250 | 858 ); |
| 859 } | |
| 1234 | 860 |
| 1319 | 861 /* for hurry_up==5 */ |
| 862 s->current_picture.pict_type = s->pict_type; | |
| 6481 | 863 s->current_picture.key_frame = (s->pict_type == FF_I_TYPE); |
| 1319 | 864 |
| 5127 | 865 /* Skip B-frames if we do not have reference frames. */ |
| 6481 | 866 if (s->last_picture_ptr == NULL && s->pict_type == FF_B_TYPE) return 0; |
| 5127 | 867 /* Skip B-frames if we are in a hurry. */ |
| 6481 | 868 if (avctx->hurry_up && s->pict_type == FF_B_TYPE) return 0; |
| 5127 | 869 /* Skip everything if we are in a hurry >= 5. */ |
| 1319 | 870 if (avctx->hurry_up >= 5) return 0; |
| 6481 | 871 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) |
| 872 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) | |
| 2792 | 873 || avctx->skip_frame >= AVDISCARD_ALL) |
| 874 return 0; | |
| 1319 | 875 |
| 876 if (s->next_p_frame_damaged) { | |
| 6481 | 877 if (s->pict_type == FF_B_TYPE) |
| 1319 | 878 return 0; |
| 879 else | |
| 880 s->next_p_frame_damaged = 0; | |
| 881 } | |
| 1234 | 882 |
| 4395 | 883 if (frame_start (h) < 0) |
| 884 return -1; | |
| 1234 | 885 |
| 6481 | 886 if (s->pict_type == FF_B_TYPE) { |
| 1319 | 887 h->frame_num_offset = (h->slice_num - h->prev_frame_num); |
| 888 | |
| 889 if (h->frame_num_offset < 0) { | |
| 890 h->frame_num_offset += 256; | |
| 891 } | |
| 892 if (h->frame_num_offset == 0 || h->frame_num_offset >= h->prev_frame_num_offset) { | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1330
diff
changeset
|
893 av_log(h->s.avctx, AV_LOG_ERROR, "error in B-frame picture id\n"); |
| 1319 | 894 return -1; |
| 895 } | |
| 896 } else { | |
| 897 h->prev_frame_num = h->frame_num; | |
| 898 h->frame_num = h->slice_num; | |
| 899 h->prev_frame_num_offset = (h->frame_num - h->prev_frame_num); | |
| 900 | |
| 901 if (h->prev_frame_num_offset < 0) { | |
| 902 h->prev_frame_num_offset += 256; | |
| 903 } | |
| 904 } | |
| 905 | |
| 906 for(m=0; m<2; m++){ | |
| 907 int i; | |
| 908 for(i=0; i<4; i++){ | |
| 909 int j; | |
| 910 for(j=-1; j<4; j++) | |
| 2979 | 911 h->ref_cache[m][scan8[0] + 8*i + j]= 1; |
| 5008 | 912 if(i<3) |
| 913 h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE; | |
| 1319 | 914 } |
| 1252 | 915 } |
| 2967 | 916 |
| 1234 | 917 for (s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) { |
| 918 for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { | |
|
6789
8107e891b226
Previous commit missed an initialization - this fixes FATE's test sample.
astrange
parents:
6787
diff
changeset
|
919 h->mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
| 1319 | 920 |
|
2614
5e24800ab329
various fixes related to the non alt_bitstream_reader
michael
parents:
2453
diff
changeset
|
921 if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits && |
| 2979 | 922 ((get_bits_count(&s->gb) & 7) == 0 || show_bits (&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) { |
| 1319 | 923 |
| 2979 | 924 skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb)); |
| 925 s->gb.size_in_bits = 8*buf_size; | |
| 1319 | 926 |
| 2979 | 927 if (svq3_decode_slice_header (h)) |
| 928 return -1; | |
| 1319 | 929 |
| 2979 | 930 /* TODO: support s->mb_skip_run */ |
| 1319 | 931 } |
| 932 | |
| 933 mb_type = svq3_get_ue_golomb (&s->gb); | |
| 1234 | 934 |
| 6481 | 935 if (s->pict_type == FF_I_TYPE) { |
| 2979 | 936 mb_type += 8; |
| 6481 | 937 } else if (s->pict_type == FF_B_TYPE && mb_type >= 4) { |
| 2979 | 938 mb_type += 4; |
| 1234 | 939 } |
| 1319 | 940 if (mb_type > 33 || svq3_decode_mb (h, mb_type)) { |
| 2979 | 941 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
| 942 return -1; | |
| 1234 | 943 } |
| 944 | |
| 945 if (mb_type != 0) { | |
| 2979 | 946 hl_decode_mb (h); |
| 1234 | 947 } |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
948 |
| 6481 | 949 if (s->pict_type != FF_B_TYPE && !s->low_delay) { |
| 2979 | 950 s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] = |
| 6481 | 951 (s->pict_type == FF_P_TYPE && mb_type < 8) ? (mb_type - 1) : -1; |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1321
diff
changeset
|
952 } |
| 1234 | 953 } |
| 1268 | 954 |
| 955 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
| 1234 | 956 } |
| 957 | |
| 1319 | 958 MPV_frame_end(s); |
| 959 | |
| 6481 | 960 if (s->pict_type == FF_B_TYPE || s->low_delay) { |
| 1319 | 961 *(AVFrame *) data = *(AVFrame *) &s->current_picture; |
| 962 } else { | |
| 963 *(AVFrame *) data = *(AVFrame *) &s->last_picture; | |
| 964 } | |
| 1234 | 965 |
| 1319 | 966 avctx->frame_number = s->picture_number - 1; |
| 967 | |
| 5127 | 968 /* Do not output the last pic after seeking. */ |
| 1319 | 969 if (s->last_picture_ptr || s->low_delay) { |
| 970 *data_size = sizeof(AVFrame); | |
| 971 } | |
| 972 | |
| 1234 | 973 return buf_size; |
| 974 } | |
| 975 | |
| 976 | |
| 977 AVCodec svq3_decoder = { | |
| 978 "svq3", | |
| 979 CODEC_TYPE_VIDEO, | |
| 980 CODEC_ID_SVQ3, | |
| 981 sizeof(H264Context), | |
| 982 decode_init, | |
| 983 NULL, | |
| 984 decode_end, | |
| 985 svq3_decode_frame, | |
| 2453 | 986 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_DELAY, |
|
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6789
diff
changeset
|
987 .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3"), |
| 1234 | 988 }; |
