* MACE decoder
* Copyright (c) 2002 Laszlo Torok <torokl@alpha.dfmk.hu>
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file mace.c
+ * @file
* MACE decoder.
*/
#include "avcodec.h"
/*
- * Adapted to ffmpeg by Francois Revol <revol@free.fr>
+ * Adapted to libavcodec by Francois Revol <revol@free.fr>
* (removed 68k REG stuff, changed types, added some statics and consts,
* libavcodec api, context stuff, interlaced stereo out).
*/
{ 14576, 32767}, { 15226, 32767}, { 15906, 32767}, { 16615, 32767}
};
+static const struct {
+ const int16_t *tab1; const int16_t *tab2; int stride;
+} tabs[] = {
+ {MACEtab1, &MACEtab2[0][0], 4},
+ {MACEtab3, &MACEtab4[0][0], 2},
+ {MACEtab1, &MACEtab2[0][0], 4}
+};
+
#define QT_8S_2_16S(x) (((x) & 0xFF00) | (((x) >> 8) & 0xFF))
typedef struct ChannelData {
} ChannelData;
typedef struct MACEContext {
+ AVFrame frame;
ChannelData chd[2];
} MACEContext;
return n;
}
-static void chomp3(ChannelData *chd, int16_t *output, uint8_t val,
- const int16_t tab1[],
- const int16_t *tab2, int tab2_stride,
- uint32_t numChannels)
+static int16_t read_table(ChannelData *chd, uint8_t val, int tab_idx)
{
int16_t current;
- if (val < tab2_stride)
- current = tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + val];
+ if (val < tabs[tab_idx].stride)
+ current = tabs[tab_idx].tab2[((chd->index & 0x7f0) >> 4) * tabs[tab_idx].stride + val];
else
- current = - 1 - tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1];
+ current = - 1 - tabs[tab_idx].tab2[((chd->index & 0x7f0) >> 4)*tabs[tab_idx].stride + 2*tabs[tab_idx].stride-val-1];
+
+ if (( chd->index += tabs[tab_idx].tab1[val]-(chd->index >> 5) ) < 0)
+ chd->index = 0;
+
+ return current;
+}
+
+static void chomp3(ChannelData *chd, int16_t *output, uint8_t val,
+ int tab_idx,
+ uint32_t numChannels)
+{
+
+ int16_t current = read_table(chd, val, tab_idx);
current = mace_broken_clip_int16(current + chd->level);
chd->level = current - (current >> 3);
*output = QT_8S_2_16S(current);
- if (( chd->index += tab1[val]-(chd->index >> 5) ) < 0)
- chd->index = 0;
}
static void chomp6(ChannelData *chd, int16_t *output, uint8_t val,
- const int16_t tab1[],
- const int16_t *tab2, int tab2_stride,
+ int tab_idx,
uint32_t numChannels)
{
- int16_t current;
-
- if (val < tab2_stride)
- current = tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + val];
- else
- current = - 1 - tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1];
+ int16_t current = read_table(chd, val, tab_idx);
if ((chd->previous ^ current) >= 0) {
chd->factor = FFMIN(chd->factor + 506, 32767);
((chd->prev2-current) >> 2));
chd->prev2 = chd->previous;
chd->previous = current;
-
- if ((chd->index += tab1[val] - (chd->index >> 5)) < 0)
- chd->index = 0;
}
static av_cold int mace_decode_init(AVCodecContext * avctx)
{
+ MACEContext *ctx = avctx->priv_data;
+
if (avctx->channels > 2)
return -1;
- avctx->sample_fmt = SAMPLE_FMT_S16;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+
+ avcodec_get_frame_defaults(&ctx->frame);
+ avctx->coded_frame = &ctx->frame;
+
return 0;
}
-static int mace3_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+static int mace_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
{
- int16_t *samples = data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ int16_t *samples;
MACEContext *ctx = avctx->priv_data;
- int i, j, k;
-
- if (*data_size < 2 * 3 * buf_size) {
- av_log(avctx, AV_LOG_ERROR, "Output buffer too small!\n");
- return -1;
+ int i, j, k, l, ret;
+ int is_mace3 = (avctx->codec_id == CODEC_ID_MACE3);
+
+ /* get output buffer */
+ ctx->frame.nb_samples = 3 * (buf_size << (1 - is_mace3)) / avctx->channels;
+ if ((ret = avctx->get_buffer(avctx, &ctx->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
}
+ samples = (int16_t *)ctx->frame.data[0];
for(i = 0; i < avctx->channels; i++) {
int16_t *output = samples + i;
- for (j=0; j < buf_size / 2 / avctx->channels; j++)
- for (k=0; k < 2; k++) {
- uint8_t pkt = buf[i*2 + j*2*avctx->channels + k];
- chomp3(&ctx->chd[i], output, pkt &7, MACEtab1, MACEtab2,
- 4, avctx->channels);
- output += avctx->channels;
- chomp3(&ctx->chd[i], output,(pkt >> 3) &3, MACEtab3, MACEtab4,
- 2, avctx->channels);
- output += avctx->channels;
- chomp3(&ctx->chd[i], output, pkt >> 5 , MACEtab1, MACEtab2,
- 4, avctx->channels);
- output += avctx->channels;
- }
- }
-
- *data_size = 2 * 3 * buf_size;
-
- return buf_size;
-}
-
-static int mace6_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- const uint8_t *buf, int buf_size)
-{
- int16_t *samples = data;
- MACEContext *ctx = avctx->priv_data;
- int i, j;
+ for (j=0; j < buf_size / (avctx->channels << is_mace3); j++)
+ for (k=0; k < (1 << is_mace3); k++) {
+ uint8_t pkt = buf[(i << is_mace3) +
+ (j*avctx->channels << is_mace3) + k];
- if (*data_size < 2 * 6 * buf_size) {
- av_log(avctx, AV_LOG_ERROR, "Output buffer too small!\n");
- return -1;
- }
+ uint8_t val[2][3] = {{pkt >> 5, (pkt >> 3) & 3, pkt & 7 },
+ {pkt & 7 , (pkt >> 3) & 3, pkt >> 5}};
- for(i = 0; i < avctx->channels; i++) {
- int16_t *output = samples + i;
+ for (l=0; l < 3; l++) {
+ if (is_mace3)
+ chomp3(&ctx->chd[i], output, val[1][l], l,
+ avctx->channels);
+ else
+ chomp6(&ctx->chd[i], output, val[0][l], l,
+ avctx->channels);
- for (j = 0; j < buf_size / avctx->channels; j++) {
- uint8_t pkt = buf[i + j*avctx->channels];
-
- chomp6(&ctx->chd[i], output, pkt >> 5 , MACEtab1, MACEtab2,
- 4, avctx->channels);
- output += avctx->channels << 1;
- chomp6(&ctx->chd[i], output,(pkt >> 3) & 3, MACEtab3, MACEtab4,
- 2, avctx->channels);
- output += avctx->channels << 1;
- chomp6(&ctx->chd[i], output, pkt & 7, MACEtab1, MACEtab2,
- 4, avctx->channels);
- output += avctx->channels << 1;
- }
+ output += avctx->channels << (1-is_mace3);
+ }
+ }
}
- *data_size = 2 * 6 * buf_size;
+ *got_frame_ptr = 1;
+ *(AVFrame *)data = ctx->frame;
return buf_size;
}
-AVCodec mace3_decoder = {
- "mace3",
- CODEC_TYPE_AUDIO,
- CODEC_ID_MACE3,
- sizeof(MACEContext),
- mace_decode_init,
- NULL,
- NULL,
- mace3_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"),
+AVCodec ff_mace3_decoder = {
+ .name = "mace3",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_MACE3,
+ .priv_data_size = sizeof(MACEContext),
+ .init = mace_decode_init,
+ .decode = mace_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"),
};
-AVCodec mace6_decoder = {
- "mace6",
- CODEC_TYPE_AUDIO,
- CODEC_ID_MACE6,
- sizeof(MACEContext),
- mace_decode_init,
- NULL,
- NULL,
- mace6_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"),
+AVCodec ff_mace6_decoder = {
+ .name = "mace6",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_MACE6,
+ .priv_data_size = sizeof(MACEContext),
+ .init = mace_decode_init,
+ .decode = mace_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"),
};
-
projects / ffmpeg / blobdiff