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

Introducing DV_MAX_BPM macro instead of a hardcoded value for the 

highest number of blocks per macroblock

Originally committed as revision 14840 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roman Shaposhnik 2008-08-19 16:00:26 +00:00
parent 2c8d438893
commit cb879ec2fb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dv.c
View File

@ -360,8 +360,8 @@ static inline void dv_decode_video_segment(DVVideoContext *s,
const uint8_t *buf_ptr;
PutBitContext pb, vs_pb;
GetBitContext gb;
BlockInfo mb_data[5 * 6], *mb, *mb1;
DECLARE_ALIGNED_16(DCTELEM, sblock[5*6][64]);
BlockInfo mb_data[5 * DV_MAX_BPM], *mb, *mb1;
DECLARE_ALIGNED_16(DCTELEM, sblock[5*DV_MAX_BPM][64]);
DECLARE_ALIGNED_8(uint8_t, mb_bit_buffer[80 + 4]); /* allow some slack */
DECLARE_ALIGNED_8(uint8_t, vs_bit_buffer[5 * 80 + 4]); /* allow some slack */
const int log2_blocksize= 3-s->avctx->lowres;

3
libavcodec/dvdata.h
View File

@ -2638,6 +2638,9 @@ enum dv_pack_type {
/* largest possible DV frame, in bytes (PAL 50Mbps) */
#define DV_MAX_FRAME_SIZE 288000
/* maximum number of blocks per macroblock in any DV format */
#define DV_MAX_BPM 8
static inline const DVprofile* dv_frame_profile(const uint8_t* frame)
{
if ((frame[3] & 0x80) == 0) { /* DSF flag */