#include <stdint.h>
+#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
-#include "libavutil/audioconvert.h"
#include "get_bits.h"
#include "parser.h"
#include "mlp_parser.h"
AV_CH_LOW_FREQUENCY, // LFE
AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRs
AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT, // LRvh
- AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRc
+ AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRc
AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT, // LRrs
AV_CH_BACK_CENTER, // Cs
- AV_CH_TOP_BACK_CENTER, // Ts
- AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRsd
- AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRw
- AV_CH_TOP_BACK_CENTER, // Cvh
- AV_CH_LOW_FREQUENCY // LFE2
+ AV_CH_TOP_CENTER, // Ts
+ AV_CH_SURROUND_DIRECT_LEFT|AV_CH_SURROUND_DIRECT_RIGHT, // LRsd
+ AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT, // LRw
+ AV_CH_TOP_FRONT_CENTER, // Cvh
+ AV_CH_LOW_FREQUENCY_2, // LFE2
};
static int mlp_samplerate(int in)
return channels;
}
-static int64_t truehd_layout(int chanmap)
+static uint64_t truehd_layout(int chanmap)
{
- int layout = 0, i;
+ int i;
+ uint64_t layout = 0;
for (i = 0; i < 13; i++)
layout |= thd_layout[i] * ((chanmap >> i) & 1);
int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb)
{
- int ratebits;
+ int ratebits, channel_arrangement;
uint16_t checksum;
assert(get_bits_count(gb) == 0);
skip_bits(gb, 11);
- mh->channels_mlp = get_bits(gb, 5);
+ channel_arrangement = get_bits(gb, 5);
+ mh->channels_mlp = mlp_channels[channel_arrangement];
+ mh->channel_layout_mlp = mlp_layout[channel_arrangement];
} else if (mh->stream_type == 0xba) {
mh->group1_bits = 24; // TODO: Is this information actually conveyed anywhere?
mh->group2_bits = 0;
skip_bits(gb, 8);
- mh->channels_thd_stream1 = get_bits(gb, 5);
+ channel_arrangement = get_bits(gb, 5);
+ mh->channels_thd_stream1 = truehd_channels(channel_arrangement);
+ mh->channel_layout_thd_stream1 = truehd_layout(channel_arrangement);
skip_bits(gb, 2);
- mh->channels_thd_stream2 = get_bits(gb, 13);
+ channel_arrangement = get_bits(gb, 13);
+ mh->channels_thd_stream2 = truehd_channels(channel_arrangement);
+ mh->channel_layout_thd_stream2 = truehd_layout(channel_arrangement);
} else
return AVERROR_INVALIDDATA;
else
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
avctx->sample_rate = mh.group1_samplerate;
- avctx->frame_size = mh.access_unit_size;
+ s->duration = mh.access_unit_size;
if (mh.stream_type == 0xbb) {
/* MLP stream */
- avctx->channels = mlp_channels[mh.channels_mlp];
- avctx->channel_layout = mlp_layout[mh.channels_mlp];
+#if FF_API_REQUEST_CHANNELS
+ if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
+ mh.num_substreams > 1) {
+ avctx->channels = 2;
+ avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else
+#endif
+ if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO &&
+ mh.num_substreams > 1) {
+ avctx->channels = 2;
+ avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else {
+ avctx->channels = mh.channels_mlp;
+ avctx->channel_layout = mh.channel_layout_mlp;
+ }
} else { /* mh.stream_type == 0xba */
/* TrueHD stream */
- if (mh.channels_thd_stream2) {
- avctx->channels = truehd_channels(mh.channels_thd_stream2);
- avctx->channel_layout = truehd_layout(mh.channels_thd_stream2);
+#if FF_API_REQUEST_CHANNELS
+ if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
+ mh.num_substreams > 1) {
+ avctx->channels = 2;
+ avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else if (avctx->request_channels > 0 &&
+ avctx->request_channels <= mh.channels_thd_stream1) {
+ avctx->channels = mh.channels_thd_stream1;
+ avctx->channel_layout = mh.channel_layout_thd_stream1;
+ } else
+#endif
+ if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO &&
+ mh.num_substreams > 1) {
+ avctx->channels = 2;
+ avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else if (avctx->request_channel_layout == mh.channel_layout_thd_stream1 ||
+ !mh.channels_thd_stream2) {
+ avctx->channels = mh.channels_thd_stream1;
+ avctx->channel_layout = mh.channel_layout_thd_stream1;
} else {
- avctx->channels = truehd_channels(mh.channels_thd_stream1);
- avctx->channel_layout = truehd_layout(mh.channels_thd_stream1);
+ avctx->channels = mh.channels_thd_stream2;
+ avctx->channel_layout = mh.channel_layout_thd_stream2;
}
}
}
AVCodecParser ff_mlp_parser = {
- .codec_ids = { CODEC_ID_MLP, CODEC_ID_TRUEHD },
+ .codec_ids = { AV_CODEC_ID_MLP, AV_CODEC_ID_TRUEHD },
.priv_data_size = sizeof(MLPParseContext),
.parser_init = mlp_init,
.parser_parse = mlp_parse,