#include <stdint.h>
#include "libavutil/crc.h"
+#include "libavutil/audioconvert.h"
#include "get_bits.h"
#include "parser.h"
#include "mlp_parser.h"
return channels;
}
-static int64_t truehd_layout(int chanmap)
+static uint64_t truehd_layout(int chanmap)
{
int layout = 0, i;
checksum = ff_mlp_checksum16(gb->buffer, 26);
if (checksum != AV_RL16(gb->buffer+26)) {
av_log(log, AV_LOG_ERROR, "major sync info header checksum error\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (get_bits_long(gb, 24) != 0xf8726f) /* Sync words */
- return -1;
+ return AVERROR_INVALIDDATA;
mh->stream_type = get_bits(gb, 8);
mh->channels_thd_stream2 = get_bits(gb, 13);
} else
- return -1;
+ return AVERROR_INVALIDDATA;
mh->access_unit_size = 40 << (ratebits & 7);
mh->access_unit_size_pow2 = 64 << (ratebits & 7);
}
AVCodecParser ff_mlp_parser = {
- { CODEC_ID_MLP, CODEC_ID_TRUEHD },
- sizeof(MLPParseContext),
- mlp_init,
- mlp_parse,
- ff_parse_close,
+ .codec_ids = { CODEC_ID_MLP, CODEC_ID_TRUEHD },
+ .priv_data_size = sizeof(MLPParseContext),
+ .parser_init = mlp_init,
+ .parser_parse = mlp_parse,
+ .parser_close = ff_parse_close,
};