comparison ra288.c @ 1316:b1d624981afd libavcodec

optimization: merge phases 0 and 1

1315:6696d3bf4ff2

    for (sum=0,x=len;x--;sum+=(*p1++)*(*p2++));
    tgt[n--]=sum;
  }
}

void * decode_block(AVCodecContext * avctx, unsigned char *in, signed short int *out)
{
  int x,y;
  Real288_internal *glob=avctx->priv_data;
  int cfs=((short*)(avctx->extradata))[3]; /* coded frame size 38 */
  unsigned short int buffer[cfs];

  unpack(buffer,in,cfs);
  for (x=0;x<32;x++)
  {
    glob->phasep=(glob->phase=x&7)*5;
    decode(glob,buffer[x]);
    for (y=0;y<5;*(out++)=8*glob->output[glob->phasep+(y++)]);

//((short*)(avctx->extradata))[1]; /* subpacket height */
//((short*)(avctx->extradata))[2]; /* subpacket flavour */
//((short*)(avctx->extradata))[3]; /* coded frame size */
//((short*)(avctx->extradata))[4]; /* codec's data length  */
//((short*)(avctx->extradata))[5...] /* codec's data */
    int z,bret;
    void *datao;
    int w=avctx->block_align; /* 228 */
    int h=((short*)(avctx->extradata))[1]; /* 12 */
    int cfs=((short*)(avctx->extradata))[3]; /* coded frame size 38 */
    int i,j;
    unsigned char tb[h*w], *ptb;
    if(buf_size<w*h)
    {
	fprintf(stderr,"ffra288: Error! Input buffer is too small [%d<%d]\n",buf_size,w*h);
	return 0;
    }
    datao = data;
    ptb = buf;
    /* Phase 0: deinterleave */
    for (j = 0; j < h; j++)
	for (i = 0; i < h/2; i++)
    {
	    memcpy(&tb[i*2*w+j*cfs],ptb,cfs);
	    ptb += cfs;
    }
    /* Phase 1: decode */
    bret = ptb-buf;
    for(z=0;z<bret;z+=cfs) data=decode_block(avctx,&tb[z],(signed short *)data);
    *data_size = data - datao;
    return bret;
  }
  else
  {

1316:b1d624981afd

    for (sum=0,x=len;x--;sum+=(*p1++)*(*p2++));
    tgt[n--]=sum;
  }
}

void * decode_block(AVCodecContext * avctx, unsigned char *in, signed short int *out,unsigned len)
{
  int x,y;
  Real288_internal *glob=avctx->priv_data;
  unsigned short int buffer[len];

  unpack(buffer,in,len);
  for (x=0;x<32;x++)
  {
    glob->phasep=(glob->phase=x&7)*5;
    decode(glob,buffer[x]);
    for (y=0;y<5;*(out++)=8*glob->output[glob->phasep+(y++)]);

//((short*)(avctx->extradata))[1]; /* subpacket height */
//((short*)(avctx->extradata))[2]; /* subpacket flavour */
//((short*)(avctx->extradata))[3]; /* coded frame size */
//((short*)(avctx->extradata))[4]; /* codec's data length  */
//((short*)(avctx->extradata))[5...] /* codec's data */
    int bret;
    void *datao;
    int w=avctx->block_align; /* 228 */
    int h=((short*)(avctx->extradata))[1]; /* 12 */
    int cfs=((short*)(avctx->extradata))[3]; /* coded frame size 38 */
    int i,j;
    if(buf_size<w*h)
    {
	fprintf(stderr,"ffra288: Error! Input buffer is too small [%d<%d]\n",buf_size,w*h);
	return 0;
    }
    datao = data;
    bret = 0;
    for (j = 0; j < h/2; j++)
	for (i = 0; i < h; i++)
    {
	    data=decode_block(avctx,&buf[j*cfs+cfs*i*h/2],(signed short *)data,cfs);
	    bret += cfs;
    }
    *data_size = data - datao;
    return bret;
  }
  else
  {