xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify: use two distinct functions to decode MACE3 and MACE6, since the

Browse Source 
previous mace_decode_init() function was almost just a switch statement.

Originally committed as revision 15208 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-09-04 23:18:28 +00:00
parent b97c413832
commit 78df225866
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libavcodec/mace.c
View File

@ -391,7 +391,7 @@ static av_cold int mace_decode_init(AVCodecContext * avctx)
return 0; return 0;
} }
static int mace_decode_frame(AVCodecContext *avctx, static int mace3_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
@ -399,27 +399,29 @@ static int mace_decode_frame(AVCodecContext *avctx,
MACEContext *c = avctx->priv_data; MACEContext *c = avctx->priv_data;
int i; int i;
switch (avctx->codec->id) { for(i = 0; i < avctx->channels; i++)
case CODEC_ID_MACE3: Exp1to3(c, buf, samples + i, buf_size / 2 / avctx->channels,
dprintf(avctx, "mace_decode_frame[3]()"); avctx->channels, i + 1);
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; *data_size = 2 * 3 * buf_size;
break;
case CODEC_ID_MACE6:
dprintf(avctx, "mace_decode_frame[6]()");
for(i = 0; i < avctx->channels; i++) return buf_size;
Exp1to6(c, buf, samples + i, buf_size / avctx->channels, }
avctx->channels, i + 1);
static int mace6_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
const uint8_t *buf, int buf_size)
{
short *samples = data;
MACEContext *c = avctx->priv_data;
int i;
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;
*data_size = 2 * 6 * buf_size;
break;
default:
return -1;
}
return buf_size; return buf_size;
} }
@ -431,7 +433,7 @@ AVCodec mace3_decoder = {
mace_decode_init, mace_decode_init,
NULL, NULL,
NULL, NULL,
mace_decode_frame, mace3_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"),
}; };
@ -443,7 +445,7 @@ AVCodec mace6_decoder = {
mace_decode_init, mace_decode_init,
NULL, NULL,
NULL, NULL,
mace_decode_frame, mace6_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"), .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"),
}; };