comparison indeo3.c @ 4591:16c24b902f43 libavcodec

use FFMIN patch by ramiro _at_ lisha.ufsc.br

4590:7cb6b1272f34

static void iv_Decode_Chunk(Indeo3DecodeContext *s, unsigned char *cur,
  unsigned char *ref, int width, int height, unsigned char *buf1,
  long fflags2, unsigned char *hdr,
  unsigned char *buf2, int min_width_160);

#ifndef min
#define min(a,b) ((a) < (b) ? (a) : (b))
#endif

/* ---------------------------------------------------------------------- */
static void iv_alloc_frames(Indeo3DecodeContext *s)
{
  int luma_width, luma_height, luma_pixels, chroma_width, chroma_height,
      chroma_pixels, i;

  offs = le2me_32(*(uint32_t *)buf_pos);
  buf_pos += 4;

  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,
    min(hdr_width, 160));

  if (!(s->avctx->flags & CODEC_FLAG_GRAY))
  {

  buf_pos = buf + 16 + offs2;
  offs = le2me_32(*(uint32_t *)buf_pos);
  buf_pos += 4;

  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,
    min(chroma_width, 40));

  buf_pos = buf + 16 + offs3;
  offs = le2me_32(*(uint32_t *)buf_pos);
  buf_pos += 4;

  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,
    min(chroma_width, 40));

  }

  return 8;
}

4591:16c24b902f43

static void iv_Decode_Chunk(Indeo3DecodeContext *s, unsigned char *cur,
  unsigned char *ref, int width, int height, unsigned char *buf1,
  long fflags2, unsigned char *hdr,
  unsigned char *buf2, int min_width_160);

/* ---------------------------------------------------------------------- */
static void iv_alloc_frames(Indeo3DecodeContext *s)
{
  int luma_width, luma_height, luma_pixels, chroma_width, chroma_height,
      chroma_pixels, i;

  offs = le2me_32(*(uint32_t *)buf_pos);
  buf_pos += 4;

  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,
    FFMIN(hdr_width, 160));

  if (!(s->avctx->flags & CODEC_FLAG_GRAY))
  {

  buf_pos = buf + 16 + offs2;
  offs = le2me_32(*(uint32_t *)buf_pos);
  buf_pos += 4;

  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,
    FFMIN(chroma_width, 40));

  buf_pos = buf + 16 + offs3;
  offs = le2me_32(*(uint32_t *)buf_pos);
  buf_pos += 4;

  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,
    FFMIN(chroma_width, 40));

  }

  return 8;
}