generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify mace_decode_frame()

Browse Source 
Originally committed as revision 15207 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-09-04 23:12:20 +00:00
parent 62c24705c8
commit b97c413832
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/mace.c
View File

@ -395,23 +395,26 @@ static int mace_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
const uint8_t *buf, int buf_size)
{
short *samples;
short *samples = data;
MACEContext *c = avctx->priv_data;
int i;
samples = (short *)data;
switch (avctx->codec->id) {
case CODEC_ID_MACE3:
dprintf(avctx, "mace_decode_frame[3]()");
Exp1to3(c, buf, samples, buf_size / 2 / avctx->channels, avctx->channels, 1);
if (avctx->channels == 2)
Exp1to3(c, buf, samples+1, buf_size / 2 / 2, 2, 2);
for(i = 0; i < avctx->channels; i++)
Exp1to3(c, buf, samples + i, buf_size / 2 / avctx->channels,
avctx->channels, i + 1);
*data_size = 2 * 3 * buf_size;
break;
case CODEC_ID_MACE6:
dprintf(avctx, "mace_decode_frame[6]()");
Exp1to6(c, buf, samples, buf_size / avctx->channels, avctx->channels, 1);
if (avctx->channels == 2)
Exp1to6(c, buf, samples+1, buf_size / 2, 2, 2);
for(i = 0; i < avctx->channels; i++)
Exp1to6(c, buf, samples + i, buf_size / avctx->channels,
avctx->channels, i + 1);
*data_size = 2 * 6 * buf_size;
break;
default: