Mercurial > libavcodec.hg

comparison 4xm.c @ 9414:5a738e8f9524 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use void * instead of uint8_t * for the destination buffer for dsp.bswap_buf where easily possible (mimic, eatqi, 4xm). This allows to avoid a typecast.
author reimar
date Sun, 12 Apr 2009 12:25:53 +0000
parents e0be7b3d5aeb
children 141badec76fc
comparison
equal deleted inserted replaced
9413:1eafaea58613 9414:5a738e8f9524
136 const uint16_t *wordstream; 136 const uint16_t *wordstream;
137 int mv[256]; 137 int mv[256];
138 VLC pre_vlc; 138 VLC pre_vlc;
139 int last_dc; 139 int last_dc;
140 DECLARE_ALIGNED_8(DCTELEM, block[6][64]); 140 DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
141 uint8_t *bitstream_buffer; 141 void *bitstream_buffer;
142 unsigned int bitstream_buffer_size; 142 unsigned int bitstream_buffer_size;
143 int version; 143 int version;
144 CFrameBuffer cfrm[CFRAME_BUFFER_COUNT]; 144 CFrameBuffer cfrm[CFRAME_BUFFER_COUNT];
145 } FourXContext; 145 } FourXContext;
146 146
377 bitstream_size+ bytestream_size+ wordstream_size - length); 377 bitstream_size+ bytestream_size+ wordstream_size - length);
378 return -1; 378 return -1;
379 } 379 }
380 380
381 f->bitstream_buffer= av_fast_realloc(f->bitstream_buffer, &f->bitstream_buffer_size, bitstream_size + FF_INPUT_BUFFER_PADDING_SIZE); 381 f->bitstream_buffer= av_fast_realloc(f->bitstream_buffer, &f->bitstream_buffer_size, bitstream_size + FF_INPUT_BUFFER_PADDING_SIZE);
382 f->dsp.bswap_buf((uint32_t*)f->bitstream_buffer, (const uint32_t*)(buf + extra), bitstream_size/4); 382 f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)(buf + extra), bitstream_size/4);
383 init_get_bits(&f->gb, f->bitstream_buffer, 8*bitstream_size); 383 init_get_bits(&f->gb, f->bitstream_buffer, 8*bitstream_size);
384 384
385 f->wordstream= (const uint16_t*)(buf + extra + bitstream_size); 385 f->wordstream= (const uint16_t*)(buf + extra + bitstream_size);
386 f->bytestream= buf + extra + bitstream_size + wordstream_size; 386 f->bytestream= buf + extra + bitstream_size + wordstream_size;
387 387
655 init_get_bits(&f->gb, buf + 4, 8*bitstream_size); 655 init_get_bits(&f->gb, buf + 4, 8*bitstream_size);
656 656
657 prestream_size= length + buf - prestream; 657 prestream_size= length + buf - prestream;
658 658
659 f->bitstream_buffer= av_fast_realloc(f->bitstream_buffer, &f->bitstream_buffer_size, prestream_size + FF_INPUT_BUFFER_PADDING_SIZE); 659 f->bitstream_buffer= av_fast_realloc(f->bitstream_buffer, &f->bitstream_buffer_size, prestream_size + FF_INPUT_BUFFER_PADDING_SIZE);
660 f->dsp.bswap_buf((uint32_t*)f->bitstream_buffer, (const uint32_t*)prestream, prestream_size/4); 660 f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)prestream, prestream_size/4);
661 init_get_bits(&f->pre_gb, f->bitstream_buffer, 8*prestream_size); 661 init_get_bits(&f->pre_gb, f->bitstream_buffer, 8*prestream_size);
662 662
663 f->last_dc= 0*128*8*8; 663 f->last_dc= 0*128*8*8;
664 664
665 for(y=0; y<height; y+=16){ 665 for(y=0; y<height; y+=16){