RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use bytestream. 

Originally committed as revision 11730 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-02-01 13:38:55 +00:00
parent 9bb5e9e945
commit 972c99c112
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/indeo3.c
View File

@ -27,6 +27,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "bytestream.h"
#include "indeo3data.h" #include "indeo3data.h"
@ -186,28 +187,22 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s,
buf_pos = buf; buf_pos = buf;
buf_pos += 18; buf_pos += 18;
fflags1 = le2me_16(*(uint16_t *)buf_pos); fflags1 = bytestream_get_le16(&buf_pos);
buf_pos += 2; fflags3 = bytestream_get_le32(&buf_pos);
fflags3 = le2me_32(*(uint32_t *)buf_pos);
buf_pos += 4;
fflags2 = *buf_pos++; fflags2 = *buf_pos++;
buf_pos += 3; buf_pos += 3;
hdr_height = le2me_16(*(uint16_t *)buf_pos); hdr_height = bytestream_get_le16(&buf_pos);
buf_pos += 2; hdr_width = bytestream_get_le16(&buf_pos);
hdr_width = le2me_16(*(uint16_t *)buf_pos);
if(avcodec_check_dimensions(NULL, hdr_width, hdr_height)) if(avcodec_check_dimensions(NULL, hdr_width, hdr_height))
return -1; return -1;
buf_pos += 2;
chroma_height = ((hdr_height >> 2) + 3) & 0x7ffc; chroma_height = ((hdr_height >> 2) + 3) & 0x7ffc;
chroma_width = ((hdr_width >> 2) + 3) & 0x7ffc; chroma_width = ((hdr_width >> 2) + 3) & 0x7ffc;
offs1 = le2me_32(*(uint32_t *)buf_pos); offs1 = bytestream_get_le32(&buf_pos);
offs2 = bytestream_get_le32(&buf_pos);
offs3 = bytestream_get_le32(&buf_pos);
buf_pos += 4; buf_pos += 4;
offs2 = le2me_32(*(uint32_t *)buf_pos);
buf_pos += 4;
offs3 = le2me_32(*(uint32_t *)buf_pos);
buf_pos += 8;
hdr_pos = buf_pos; hdr_pos = buf_pos;
if(fflags3 == 0x80) return 4; if(fflags3 == 0x80) return 4;
@ -220,8 +215,7 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s,
} }
buf_pos = buf + 16 + offs1; buf_pos = buf + 16 + offs1;
offs = le2me_32(*(uint32_t *)buf_pos); offs = bytestream_get_le32(&buf_pos);
buf_pos += 4;
iv_Decode_Chunk(s, s->cur_frame->Ybuf, s->ref_frame->Ybuf, hdr_width, iv_Decode_Chunk(s, s->cur_frame->Ybuf, s->ref_frame->Ybuf, hdr_width,
hdr_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos, hdr_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos,
@ -231,16 +225,14 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s,
{ {
buf_pos = buf + 16 + offs2; buf_pos = buf + 16 + offs2;
offs = le2me_32(*(uint32_t *)buf_pos); offs = bytestream_get_le32(&buf_pos);
buf_pos += 4;
iv_Decode_Chunk(s, s->cur_frame->Vbuf, s->ref_frame->Vbuf, chroma_width, iv_Decode_Chunk(s, s->cur_frame->Vbuf, s->ref_frame->Vbuf, chroma_width,
chroma_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos, chroma_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos,
FFMIN(chroma_width, 40)); FFMIN(chroma_width, 40));
buf_pos = buf + 16 + offs3; buf_pos = buf + 16 + offs3;
offs = le2me_32(*(uint32_t *)buf_pos); offs = bytestream_get_le32(&buf_pos);
buf_pos += 4;
iv_Decode_Chunk(s, s->cur_frame->Ubuf, s->ref_frame->Ubuf, chroma_width, iv_Decode_Chunk(s, s->cur_frame->Ubuf, s->ref_frame->Ubuf, chroma_width,
chroma_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos, chroma_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos,