highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make TM2 decoder byteswap input into separate buffer instead of doing it in-place.

Browse Source 
Originally committed as revision 16918 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov
2009-02-01 15:27:44 +00:00
parent a2a986371c
commit ad4d0b9ef2
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/truemotion2.c
View File

@@ -768,23 +768,33 @@ static int decode_frame(AVCodecContext *avctx,
TM2Context * const l = avctx->priv_data; TM2Context * const l = avctx->priv_data;
AVFrame * const p= (AVFrame*)&l->pic; AVFrame * const p= (AVFrame*)&l->pic;
int i, skip, t; int i, skip, t;
uint8_t *swbuf;
swbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
if(!swbuf){
av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
return -1;
}
p->reference = 1; p->reference = 1;
p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
if(avctx->reget_buffer(avctx, p) < 0){ if(avctx->reget_buffer(avctx, p) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
av_free(swbuf);
return -1; return -1;
} }
l->dsp.bswap_buf((uint32_t*)buf, (const uint32_t*)buf, buf_size >> 2); //FIXME SERIOUS BUG l->dsp.bswap_buf((uint32_t*)swbuf, (const uint32_t*)buf, buf_size >> 2);
skip = tm2_read_header(l, buf); skip = tm2_read_header(l, swbuf);
if(skip == -1) if(skip == -1){
av_free(swbuf);
return -1; return -1;
}
for(i = 0; i < TM2_NUM_STREAMS; i++){ for(i = 0; i < TM2_NUM_STREAMS; i++){
t = tm2_read_stream(l, buf + skip, tm2_stream_order[i]); t = tm2_read_stream(l, swbuf + skip, tm2_stream_order[i]);
if(t == -1){ if(t == -1){
av_free(swbuf);
return -1; return -1;
} }
skip += t; skip += t;
@@ -798,6 +808,7 @@ static int decode_frame(AVCodecContext *avctx,
l->cur = !l->cur; l->cur = !l->cur;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame*)data = l->pic; *(AVFrame*)data = l->pic;
av_free(swbuf);
return buf_size; return buf_size;
} }