* passed through the extradata[_size] fields. This atom is tacked onto
* the end of an 'alac' stsd atom and has the following format:
*
- * 32bit atom size
- * 32bit tag ("alac")
- * 32bit tag version (0)
- * 32bit samples per frame (used when not set explicitly in the frames)
- * 8bit compatible version (0)
- * 8bit sample size
- * 8bit history mult (40)
- * 8bit initial history (14)
- * 8bit rice param limit (10)
- * 8bit channels
- * 16bit maxRun (255)
- * 32bit max coded frame size (0 means unknown)
- * 32bit average bitrate (0 means unknown)
- * 32bit samplerate
+ * 32 bits atom size
+ * 32 bits tag ("alac")
+ * 32 bits tag version (0)
+ * 32 bits samples per frame (used when not set explicitly in the frames)
+ * 8 bits compatible version (0)
+ * 8 bits sample size
+ * 8 bits history mult (40)
+ * 8 bits initial history (14)
+ * 8 bits rice param limit (10)
+ * 8 bits channels
+ * 16 bits maxRun (255)
+ * 32 bits max coded frame size (0 means unknown)
+ * 32 bits average bitrate (0 means unknown)
+ * 32 bits samplerate
*/
+#include <inttypes.h>
+
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
#include "bytestream.h"
#include "internal.h"
-#include "unary.h"
#include "mathops.h"
+#include "unary_legacy.h"
#include "alac_data.h"
#define ALAC_EXTRADATA_SIZE 36
-typedef struct {
+typedef struct ALACContext {
AVCodecContext *avctx;
- AVFrame frame;
GetBitContext gb;
int channels;
buffer[ch][i] = (buffer[ch][i] << extra_bits) | extra_bits_buffer[ch][i];
}
-static int decode_element(AVCodecContext *avctx, void *data, int ch_index,
+static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
int channels)
{
ALACContext *alac = avctx->priv_data;
alac->extra_bits = get_bits(&alac->gb, 2) << 3;
bps = alac->sample_size - alac->extra_bits + channels - 1;
if (bps > 32) {
- av_log(avctx, AV_LOG_ERROR, "bps is unsupported: %d\n", bps);
+ avpriv_report_missing_feature(avctx, "bps %d", bps);
return AVERROR_PATCHWELCOME;
}
else
output_samples = alac->max_samples_per_frame;
if (!output_samples || output_samples > alac->max_samples_per_frame) {
- av_log(avctx, AV_LOG_ERROR, "invalid samples per frame: %d\n",
+ av_log(avctx, AV_LOG_ERROR, "invalid samples per frame: %"PRIu32"\n",
output_samples);
return AVERROR_INVALIDDATA;
}
if (!alac->nb_samples) {
/* get output buffer */
- alac->frame.nb_samples = output_samples;
- if ((ret = ff_get_buffer(avctx, &alac->frame)) < 0) {
+ frame->nb_samples = output_samples;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
} else if (output_samples != alac->nb_samples) {
- av_log(avctx, AV_LOG_ERROR, "sample count mismatch: %u != %d\n",
+ av_log(avctx, AV_LOG_ERROR, "sample count mismatch: %"PRIu32" != %d\n",
output_samples, alac->nb_samples);
return AVERROR_INVALIDDATA;
}
alac->nb_samples = output_samples;
if (alac->sample_size > 16) {
for (ch = 0; ch < channels; ch++)
- alac->output_samples_buffer[ch] = (int32_t *)alac->frame.extended_data[ch_index + ch];
+ alac->output_samples_buffer[ch] = (int32_t *)frame->extended_data[ch_index + ch];
}
if (is_compressed) {
int lpc_quant[2];
int rice_history_mult[2];
+ if (!alac->rice_limit) {
+ avpriv_request_sample(alac->avctx,
+ "Compression with rice limit 0");
+ return AVERROR(ENOSYS);
+ }
+
decorr_shift = get_bits(&alac->gb, 8);
decorr_left_weight = get_bits(&alac->gb, 8);
rice_history_mult[ch] = get_bits(&alac->gb, 3);
lpc_order[ch] = get_bits(&alac->gb, 5);
+ if (lpc_order[ch] >= alac->max_samples_per_frame)
+ return AVERROR_INVALIDDATA;
+
/* read the predictor table */
for (i = lpc_order[ch] - 1; i >= 0; i--)
lpc_coefs[ch][i] = get_sbits(&alac->gb, 16);
switch(alac->sample_size) {
case 16: {
for (ch = 0; ch < channels; ch++) {
- int16_t *outbuffer = (int16_t *)alac->frame.extended_data[ch_index + ch];
+ int16_t *outbuffer = (int16_t *)frame->extended_data[ch_index + ch];
for (i = 0; i < alac->nb_samples; i++)
*outbuffer++ = alac->output_samples_buffer[ch][i];
}}
int *got_frame_ptr, AVPacket *avpkt)
{
ALACContext *alac = avctx->priv_data;
+ AVFrame *frame = data;
enum AlacRawDataBlockType element;
int channels;
int ch, ret, got_end;
break;
}
if (element > TYPE_CPE && element != TYPE_LFE) {
- av_log(avctx, AV_LOG_ERROR, "syntax element unsupported: %d", element);
+ avpriv_report_missing_feature(avctx, "Syntax element %d", element);
return AVERROR_PATCHWELCOME;
}
channels = (element == TYPE_CPE) ? 2 : 1;
- if (ch + channels > alac->channels) {
+ if (ch + channels > alac->channels ||
+ ff_alac_channel_layout_offsets[alac->channels - 1][ch] + channels > alac->channels) {
av_log(avctx, AV_LOG_ERROR, "invalid element channel count\n");
return AVERROR_INVALIDDATA;
}
- ret = decode_element(avctx, data,
+ ret = decode_element(avctx, frame,
ff_alac_channel_layout_offsets[alac->channels - 1][ch],
channels);
if (ret < 0 && get_bits_left(&alac->gb))
av_log(avctx, AV_LOG_ERROR, "no end tag found. incomplete packet.\n");
return AVERROR_INVALIDDATA;
}
+ if (!alac->nb_samples) {
+ av_log(avctx, AV_LOG_ERROR, "No decodable data in the packet\n");
+ return AVERROR_INVALIDDATA;
+ }
if (avpkt->size * 8 - get_bits_count(&alac->gb) > 8) {
av_log(avctx, AV_LOG_ERROR, "Error : %d bits left\n",
avpkt->size * 8 - get_bits_count(&alac->gb));
}
- *got_frame_ptr = 1;
- *(AVFrame *)data = alac->frame;
+ *got_frame_ptr = 1;
return avpkt->size;
}
bytestream2_skipu(&gb, 12); // size:4, alac:4, version:4
alac->max_samples_per_frame = bytestream2_get_be32u(&gb);
- if (!alac->max_samples_per_frame || alac->max_samples_per_frame > INT_MAX) {
- av_log(alac->avctx, AV_LOG_ERROR, "max samples per frame invalid: %u\n",
+ if (!alac->max_samples_per_frame ||
+ alac->max_samples_per_frame > INT_MAX / sizeof(int32_t)) {
+ av_log(alac->avctx, AV_LOG_ERROR,
+ "max samples per frame invalid: %"PRIu32"\n",
alac->max_samples_per_frame);
return AVERROR_INVALIDDATA;
}
alac->avctx = avctx;
/* initialize from the extradata */
- if (alac->avctx->extradata_size != ALAC_EXTRADATA_SIZE) {
- av_log(avctx, AV_LOG_ERROR, "alac: expected %d extradata bytes\n",
- ALAC_EXTRADATA_SIZE);
- return -1;
+ if (alac->avctx->extradata_size < ALAC_EXTRADATA_SIZE) {
+ av_log(avctx, AV_LOG_ERROR, "alac: extradata is too small\n");
+ return AVERROR_INVALIDDATA;
}
if (alac_set_info(alac)) {
av_log(avctx, AV_LOG_ERROR, "alac: set_info failed\n");
case 24:
case 32: avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
break;
- default: av_log_ask_for_sample(avctx, "Sample depth %d is not supported.\n",
- alac->sample_size);
+ default: avpriv_request_sample(avctx, "Sample depth %d", alac->sample_size);
return AVERROR_PATCHWELCOME;
}
avctx->bits_per_raw_sample = alac->sample_size;
avctx->channels = alac->channels;
}
if (avctx->channels > ALAC_MAX_CHANNELS) {
- av_log(avctx, AV_LOG_ERROR, "Unsupported channel count: %d\n",
- avctx->channels);
+ avpriv_report_missing_feature(avctx, "Channel count %d",
+ avctx->channels);
return AVERROR_PATCHWELCOME;
}
avctx->channel_layout = ff_alac_channel_layouts[alac->channels - 1];
return ret;
}
- avcodec_get_frame_defaults(&alac->frame);
- avctx->coded_frame = &alac->frame;
-
return 0;
}
AVCodec ff_alac_decoder = {
.name = "alac",
+ .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_ALAC,
.priv_data_size = sizeof(ALACContext),
.init = alac_decode_init,
.close = alac_decode_close,
.decode = alac_decode_frame,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
+ .capabilities = AV_CODEC_CAP_DR1,
};