Mercurial > libavcodec.hg
comparison cinepak.c @ 4364:05e932ddaaa9 libavcodec
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
| author | alex |
|---|---|
| date | Fri, 19 Jan 2007 22:12:59 +0000 |
| parents | cdcfabd40101 |
| children | 66ef3690d108 |
comparison
equal
deleted
inserted
replaced
| 4363:9b7662fa4905 | 4364:05e932ddaaa9 |
|---|---|
| 88 for (i=0; i < 256; i++) { | 88 for (i=0; i < 256; i++) { |
| 89 if ((chunk_id & 0x0100) && !(mask >>= 1)) { | 89 if ((chunk_id & 0x0100) && !(mask >>= 1)) { |
| 90 if ((data + 4) > eod) | 90 if ((data + 4) > eod) |
| 91 break; | 91 break; |
| 92 | 92 |
| 93 flag = BE_32 (data); | 93 flag = AV_RB32 (data); |
| 94 data += 4; | 94 data += 4; |
| 95 mask = 0x80000000; | 95 mask = 0x80000000; |
| 96 } | 96 } |
| 97 | 97 |
| 98 if (!(chunk_id & 0x0100) || (flag & mask)) { | 98 if (!(chunk_id & 0x0100) || (flag & mask)) { |
| 150 for (x=strip->x1; x < strip->x2; x+=4) { | 150 for (x=strip->x1; x < strip->x2; x+=4) { |
| 151 if ((chunk_id & 0x0100) && !(mask >>= 1)) { | 151 if ((chunk_id & 0x0100) && !(mask >>= 1)) { |
| 152 if ((data + 4) > eod) | 152 if ((data + 4) > eod) |
| 153 return -1; | 153 return -1; |
| 154 | 154 |
| 155 flag = BE_32 (data); | 155 flag = AV_RB32 (data); |
| 156 data += 4; | 156 data += 4; |
| 157 mask = 0x80000000; | 157 mask = 0x80000000; |
| 158 } | 158 } |
| 159 | 159 |
| 160 if (!(chunk_id & 0x0100) || (flag & mask)) { | 160 if (!(chunk_id & 0x0100) || (flag & mask)) { |
| 161 if (!(chunk_id & 0x0200) && !(mask >>= 1)) { | 161 if (!(chunk_id & 0x0200) && !(mask >>= 1)) { |
| 162 if ((data + 4) > eod) | 162 if ((data + 4) > eod) |
| 163 return -1; | 163 return -1; |
| 164 | 164 |
| 165 flag = BE_32 (data); | 165 flag = AV_RB32 (data); |
| 166 data += 4; | 166 data += 4; |
| 167 mask = 0x80000000; | 167 mask = 0x80000000; |
| 168 } | 168 } |
| 169 | 169 |
| 170 if ((chunk_id & 0x0200) || (~flag & mask)) { | 170 if ((chunk_id & 0x0200) || (~flag & mask)) { |
| 276 strip->y1 >= s->height || strip->y2 > s->height || | 276 strip->y1 >= s->height || strip->y2 > s->height || |
| 277 strip->x1 >= strip->x2 || strip->y1 >= strip->y2) | 277 strip->x1 >= strip->x2 || strip->y1 >= strip->y2) |
| 278 return -1; | 278 return -1; |
| 279 | 279 |
| 280 while ((data + 4) <= eod) { | 280 while ((data + 4) <= eod) { |
| 281 chunk_id = BE_16 (&data[0]); | 281 chunk_id = AV_RB16 (&data[0]); |
| 282 chunk_size = BE_16 (&data[2]) - 4; | 282 chunk_size = AV_RB16 (&data[2]) - 4; |
| 283 if(chunk_size < 0) | 283 if(chunk_size < 0) |
| 284 return -1; | 284 return -1; |
| 285 | 285 |
| 286 data += 4; | 286 data += 4; |
| 287 chunk_size = ((data + chunk_size) > eod) ? (eod - data) : chunk_size; | 287 chunk_size = ((data + chunk_size) > eod) ? (eod - data) : chunk_size; |
| 326 | 326 |
| 327 if (s->size < 10) | 327 if (s->size < 10) |
| 328 return -1; | 328 return -1; |
| 329 | 329 |
| 330 frame_flags = s->data[0]; | 330 frame_flags = s->data[0]; |
| 331 num_strips = BE_16 (&s->data[8]); | 331 num_strips = AV_RB16 (&s->data[8]); |
| 332 encoded_buf_size = ((s->data[1] << 16) | BE_16 (&s->data[2])); | 332 encoded_buf_size = ((s->data[1] << 16) | AV_RB16 (&s->data[2])); |
| 333 | 333 |
| 334 /* if this is the first frame, check for deviant Sega FILM data */ | 334 /* if this is the first frame, check for deviant Sega FILM data */ |
| 335 if (s->sega_film_skip_bytes == -1) { | 335 if (s->sega_film_skip_bytes == -1) { |
| 336 if (encoded_buf_size != s->size) { | 336 if (encoded_buf_size != s->size) { |
| 337 /* If the encoded frame size differs from the frame size as indicated | 337 /* If the encoded frame size differs from the frame size as indicated |
| 359 | 359 |
| 360 for (i=0; i < num_strips; i++) { | 360 for (i=0; i < num_strips; i++) { |
| 361 if ((s->data + 12) > eod) | 361 if ((s->data + 12) > eod) |
| 362 return -1; | 362 return -1; |
| 363 | 363 |
| 364 s->strips[i].id = BE_16 (s->data); | 364 s->strips[i].id = AV_RB16 (s->data); |
| 365 s->strips[i].y1 = y0; | 365 s->strips[i].y1 = y0; |
| 366 s->strips[i].x1 = 0; | 366 s->strips[i].x1 = 0; |
| 367 s->strips[i].y2 = y0 + BE_16 (&s->data[8]); | 367 s->strips[i].y2 = y0 + AV_RB16 (&s->data[8]); |
| 368 s->strips[i].x2 = s->avctx->width; | 368 s->strips[i].x2 = s->avctx->width; |
| 369 | 369 |
| 370 strip_size = BE_16 (&s->data[2]) - 12; | 370 strip_size = AV_RB16 (&s->data[2]) - 12; |
| 371 s->data += 12; | 371 s->data += 12; |
| 372 strip_size = ((s->data + strip_size) > eod) ? (eod - s->data) : strip_size; | 372 strip_size = ((s->data + strip_size) > eod) ? (eod - s->data) : strip_size; |
| 373 | 373 |
| 374 if ((i > 0) && !(frame_flags & 0x01)) { | 374 if ((i > 0) && !(frame_flags & 0x01)) { |
| 375 memcpy (s->strips[i].v4_codebook, s->strips[i-1].v4_codebook, | 375 memcpy (s->strips[i].v4_codebook, s->strips[i-1].v4_codebook, |