comparison mace.c @ 2487:b09bc77eb2fb libavcodec

Stereo MACE fix by Burkhard Plaum <plaum AT ipf DOT uni-stuttgart DOT de> Still doesn't work with our mov demuxer though...

2486:f2a9559db6ac

/* /// "chomp3()" */
static void chomp3(MACEContext *ctx,
            uint8_t val,
            const uint16_t tab1[],
            const uint16_t tab2[][8])
{
  short current;

  current=(short)tab2[(ctx->index & 0x7f0) >> 4][val];
  if (current+ctx->lev > 32767) current=32767;
  else if (current+ctx->lev < -32768) current=-32767;
  else current+=ctx->lev;
  ctx->lev=current-(current >> 3);
//  *ctx->outPtr++=current >> 8;
  *ctx->outPtr++=current;
  if ( ( ctx->index += tab1[val]-(ctx->index>>5) ) < 0 ) ctx->index = 0;
}
/* \\\ */

/* /// "Exp1to3()" */

   ctx->outPtr=outBuffer;

   while (cnt>0) {
     pkt=inBuffer[0];
     chomp3(ctx, pkt       & 7, MACEtab1, MACEtab2);
     chomp3(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4);
     chomp3(ctx, pkt >> 5     , MACEtab1, MACEtab2);
     pkt=inBuffer[1];
     chomp3(ctx, pkt       & 7, MACEtab1, MACEtab2);
     chomp3(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4);
     chomp3(ctx, pkt >> 5     , MACEtab1, MACEtab2);

     inBuffer+=numChannels*2;
     --cnt;
   }

/* /// "chomp6()" */
static void chomp6(MACEContext *ctx,
            uint8_t val,
            const uint16_t tab1[],
            const uint16_t tab2[][8])
{
  short current;

  current=(short)tab2[(ctx->index & 0x7f0) >> 4][val];

  ctx->level=((current*ctx->factor) >> 15);
  current>>=1;

//  *ctx->outPtr++=(ctx->previous+ctx->prev2-((ctx->prev2-current) >> 2)) >> 8;
//  *ctx->outPtr++=(ctx->previous+current+((ctx->prev2-current) >> 2)) >> 8;
  *ctx->outPtr++=(ctx->previous+ctx->prev2-((ctx->prev2-current) >> 2));
  *ctx->outPtr++=(ctx->previous+current+((ctx->prev2-current) >> 2));

  ctx->prev2=ctx->previous;
  ctx->previous=current;

  if( ( ctx->index += tab1[val]-(ctx->index>>5) ) < 0 ) ctx->index = 0;
}

   ctx->outPtr=outBuffer;

   while (cnt>0) {
     pkt=*inBuffer;

     chomp6(ctx, pkt >> 5     , MACEtab1, MACEtab2);
     chomp6(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4);
     chomp6(ctx, pkt       & 7, MACEtab1, MACEtab2);

     inBuffer+=numChannels;
     --cnt;
   }

2487:b09bc77eb2fb

/* /// "chomp3()" */
static void chomp3(MACEContext *ctx,
            uint8_t val,
            const uint16_t tab1[],
            const uint16_t tab2[][8],
            uint32_t numChannels)
{
  short current;

  current=(short)tab2[(ctx->index & 0x7f0) >> 4][val];
  if (current+ctx->lev > 32767) current=32767;
  else if (current+ctx->lev < -32768) current=-32767;
  else current+=ctx->lev;
  ctx->lev=current-(current >> 3);
//  *ctx->outPtr++=current >> 8;
  *ctx->outPtr=current;
  ctx->outPtr+=numChannels;
  if ( ( ctx->index += tab1[val]-(ctx->index>>5) ) < 0 ) ctx->index = 0;
}
/* \\\ */

/* /// "Exp1to3()" */

   ctx->outPtr=outBuffer;

   while (cnt>0) {
     pkt=inBuffer[0];
     chomp3(ctx, pkt       & 7, MACEtab1, MACEtab2, numChannels);
     chomp3(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4, numChannels);
     chomp3(ctx, pkt >> 5     , MACEtab1, MACEtab2, numChannels);
     pkt=inBuffer[1];
     chomp3(ctx, pkt       & 7, MACEtab1, MACEtab2, numChannels);
     chomp3(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4, numChannels);
     chomp3(ctx, pkt >> 5     , MACEtab1, MACEtab2, numChannels);

     inBuffer+=numChannels*2;
     --cnt;
   }

/* /// "chomp6()" */
static void chomp6(MACEContext *ctx,
            uint8_t val,
            const uint16_t tab1[],
            const uint16_t tab2[][8],
            uint32_t numChannels)
{
  short current;

  current=(short)tab2[(ctx->index & 0x7f0) >> 4][val];

  ctx->level=((current*ctx->factor) >> 15);
  current>>=1;

//  *ctx->outPtr++=(ctx->previous+ctx->prev2-((ctx->prev2-current) >> 2)) >> 8;
//  *ctx->outPtr++=(ctx->previous+current+((ctx->prev2-current) >> 2)) >> 8;
  *ctx->outPtr=(ctx->previous+ctx->prev2-((ctx->prev2-current) >> 2));
  ctx->outPtr+=numChannels;
  *ctx->outPtr=(ctx->previous+current+((ctx->prev2-current) >> 2));
  ctx->outPtr+=numChannels;
  ctx->prev2=ctx->previous;
  ctx->previous=current;

  if( ( ctx->index += tab1[val]-(ctx->index>>5) ) < 0 ) ctx->index = 0;
}

   ctx->outPtr=outBuffer;

   while (cnt>0) {
     pkt=*inBuffer;

     chomp6(ctx, pkt >> 5     , MACEtab1, MACEtab2, numChannels);
     chomp6(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4, numChannels);
     chomp6(ctx, pkt       & 7, MACEtab1, MACEtab2, numChannels);

     inBuffer+=numChannels;
     --cnt;
   }