#include <stdint.h>
-#include "avcodec.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/channel_layout.h"
-#include "get_bits.h"
-#include "internal.h"
#include "libavutil/crc.h"
+
+#include "avcodec.h"
+#include "bitstream.h"
+#include "internal.h"
#include "parser.h"
#include "mlp_parser.h"
#include "mlpdsp.h"
/// Current access unit being read has a major sync.
int is_major_sync_unit;
+ /// Size of the major sync unit, in bytes
+ int major_sync_header_size;
+
/// Set if a valid major sync block has been read. Otherwise no decoding is possible.
uint8_t params_valid;
/** Read a sample, consisting of either, both or neither of entropy-coded MSBs
* and plain LSBs. */
-static inline int read_huff_channels(MLPDecodeContext *m, GetBitContext *gbp,
+static inline int read_huff_channels(MLPDecodeContext *m, BitstreamContext *bc,
unsigned int substr, unsigned int pos)
{
SubStream *s = &m->substream[substr];
for (mat = 0; mat < s->num_primitive_matrices; mat++)
if (s->lsb_bypass[mat])
- m->bypassed_lsbs[pos + s->blockpos][mat] = get_bits1(gbp);
+ m->bypassed_lsbs[pos + s->blockpos][mat] = bitstream_read_bit(bc);
for (channel = s->min_channel; channel <= s->max_channel; channel++) {
ChannelParams *cp = &s->channel_params[channel];
int result = 0;
if (codebook > 0)
- result = get_vlc2(gbp, huff_vlc[codebook-1].table,
- VLC_BITS, (9 + VLC_BITS - 1) / VLC_BITS);
+ result = bitstream_read_vlc(bc, huff_vlc[codebook-1].table,
+ VLC_BITS,
+ (9 + VLC_BITS - 1) / VLC_BITS);
if (result < 0)
return AVERROR_INVALIDDATA;
if (lsb_bits > 0)
- result = (result << lsb_bits) + get_bits(gbp, lsb_bits);
+ result = (result << lsb_bits) + bitstream_read(bc, lsb_bits);
result += cp->sign_huff_offset;
result <<= quant_step_size;
* information is not actually necessary for decoding, only for playback.
*/
-static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
+static int read_major_sync(MLPDecodeContext *m, BitstreamContext *bc)
{
MLPHeaderInfo mh;
int substr, ret;
- if ((ret = ff_mlp_read_major_sync(m->avctx, &mh, gb)) != 0)
+ if ((ret = ff_mlp_read_major_sync(m->avctx, &mh, bc)) != 0)
return ret;
if (mh.group1_bits == 0) {
return AVERROR_PATCHWELCOME;
}
+ m->major_sync_header_size = mh.header_size;
+
m->access_unit_size = mh.access_unit_size;
m->access_unit_size_pow2 = mh.access_unit_size_pow2;
m->num_substreams = mh.num_substreams;
- m->max_decoded_substream = m->num_substreams - 1;
+
+ /* limit to decoding 3 substreams, as the 4th is used by Dolby Atmos for non-audio data */
+ m->max_decoded_substream = FFMIN(m->num_substreams - 1, 2);
m->avctx->sample_rate = mh.group1_samplerate;
m->avctx->frame_size = mh.access_unit_size;
* required to decode the audio that do not change very often. Generally
* (always) present only in blocks following a major sync. */
-static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
+static int read_restart_header(MLPDecodeContext *m, BitstreamContext *bc,
const uint8_t *buf, unsigned int substr)
{
SubStream *s = &m->substream[substr];
int sync_word, tmp;
uint8_t checksum;
uint8_t lossless_check;
- int start_count = get_bits_count(gbp);
+ int start_count = bitstream_tell(bc);
int min_channel, max_channel, max_matrix_channel;
const int std_max_matrix_channel = m->avctx->codec_id == AV_CODEC_ID_MLP
? MAX_MATRIX_CHANNEL_MLP
: MAX_MATRIX_CHANNEL_TRUEHD;
- sync_word = get_bits(gbp, 13);
+ sync_word = bitstream_read(bc, 13);
if (sync_word != 0x31ea >> 1) {
av_log(m->avctx, AV_LOG_ERROR,
return AVERROR_INVALIDDATA;
}
- s->noise_type = get_bits1(gbp);
+ s->noise_type = bitstream_read_bit(bc);
if (m->avctx->codec_id == AV_CODEC_ID_MLP && s->noise_type) {
av_log(m->avctx, AV_LOG_ERROR, "MLP must have 0x31ea sync word.\n");
return AVERROR_INVALIDDATA;
}
- skip_bits(gbp, 16); /* Output timestamp */
+ bitstream_skip(bc, 16); /* Output timestamp */
- min_channel = get_bits(gbp, 4);
- max_channel = get_bits(gbp, 4);
- max_matrix_channel = get_bits(gbp, 4);
+ min_channel = bitstream_read(bc, 4);
+ max_channel = bitstream_read(bc, 4);
+ max_matrix_channel = bitstream_read(bc, 4);
if (max_matrix_channel > std_max_matrix_channel) {
av_log(m->avctx, AV_LOG_ERROR,
s->max_channel = max_channel;
s->max_matrix_channel = max_matrix_channel;
-#if FF_API_REQUEST_CHANNELS
-FF_DISABLE_DEPRECATION_WARNINGS
- if (m->avctx->request_channels > 0 &&
- m->avctx->request_channels <= s->max_channel + 1 &&
- m->max_decoded_substream > substr) {
- av_log(m->avctx, AV_LOG_DEBUG,
- "Extracting %d-channel downmix from substream %d. "
- "Further substreams will be skipped.\n",
- s->max_channel + 1, substr);
- m->max_decoded_substream = substr;
- } else
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (m->avctx->request_channel_layout && (s->ch_layout & m->avctx->request_channel_layout) ==
m->avctx->request_channel_layout && m->max_decoded_substream > substr) {
av_log(m->avctx, AV_LOG_DEBUG,
m->max_decoded_substream = substr;
}
- s->noise_shift = get_bits(gbp, 4);
- s->noisegen_seed = get_bits(gbp, 23);
+ s->noise_shift = bitstream_read(bc, 4);
+ s->noisegen_seed = bitstream_read(bc, 23);
- skip_bits(gbp, 19);
+ bitstream_skip(bc, 19);
- s->data_check_present = get_bits1(gbp);
- lossless_check = get_bits(gbp, 8);
+ s->data_check_present = bitstream_read_bit(bc);
+ lossless_check = bitstream_read(bc, 8);
if (substr == m->max_decoded_substream
&& s->lossless_check_data != 0xffffffff) {
tmp = xor_32_to_8(s->lossless_check_data);
lossless_check, tmp);
}
- skip_bits(gbp, 16);
+ bitstream_skip(bc, 16);
memset(s->ch_assign, 0, sizeof(s->ch_assign));
for (ch = 0; ch <= s->max_matrix_channel; ch++) {
- int ch_assign = get_bits(gbp, 6);
+ int ch_assign = bitstream_read(bc, 6);
if (m->avctx->codec_id == AV_CODEC_ID_TRUEHD) {
uint64_t channel = thd_channel_layout_extract_channel(s->ch_layout,
ch_assign);
ch_assign = av_get_channel_layout_channel_index(s->ch_layout,
channel);
}
- if (ch_assign > s->max_matrix_channel) {
+ if (ch_assign < 0 || ch_assign > s->max_matrix_channel) {
avpriv_request_sample(m->avctx,
"Assignment of matrix channel %d to invalid output channel %d",
ch, ch_assign);
s->ch_assign[ch_assign] = ch;
}
- checksum = ff_mlp_restart_checksum(buf, get_bits_count(gbp) - start_count);
+ checksum = ff_mlp_restart_checksum(buf, bitstream_tell(bc) - start_count);
- if (checksum != get_bits(gbp, 8))
+ if (checksum != bitstream_read(bc, 8))
av_log(m->avctx, AV_LOG_ERROR, "restart header checksum error\n");
/* Set default decoding parameters. */
/* Default audio coding is 24-bit raw PCM. */
cp->huff_offset = 0;
- cp->sign_huff_offset = (-1) << 23;
+ cp->sign_huff_offset = -(1 << 23);
cp->codebook = 0;
cp->huff_lsbs = 24;
}
/** Read parameters for one of the prediction filters. */
-static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp,
+static int read_filter_params(MLPDecodeContext *m, BitstreamContext *bc,
unsigned int substr, unsigned int channel,
unsigned int filter)
{
return AVERROR_INVALIDDATA;
}
- order = get_bits(gbp, 4);
+ order = bitstream_read(bc, 4);
if (order > max_order) {
av_log(m->avctx, AV_LOG_ERROR,
"%cIR filter order %d is greater than maximum %d.\n",
int32_t *fcoeff = s->channel_params[channel].coeff[filter];
int coeff_bits, coeff_shift;
- fp->shift = get_bits(gbp, 4);
+ fp->shift = bitstream_read(bc, 4);
- coeff_bits = get_bits(gbp, 5);
- coeff_shift = get_bits(gbp, 3);
+ coeff_bits = bitstream_read(bc, 5);
+ coeff_shift = bitstream_read(bc, 3);
if (coeff_bits < 1 || coeff_bits > 16) {
av_log(m->avctx, AV_LOG_ERROR,
"%cIR filter coeff_bits must be between 1 and 16.\n",
}
for (i = 0; i < order; i++)
- fcoeff[i] = get_sbits(gbp, coeff_bits) << coeff_shift;
+ fcoeff[i] = bitstream_read_signed(bc, coeff_bits) << coeff_shift;
- if (get_bits1(gbp)) {
+ if (bitstream_read_bit(bc)) {
int state_bits, state_shift;
if (filter == FIR) {
return AVERROR_INVALIDDATA;
}
- state_bits = get_bits(gbp, 4);
- state_shift = get_bits(gbp, 4);
+ state_bits = bitstream_read(bc, 4);
+ state_shift = bitstream_read(bc, 4);
/* TODO: Check validity of state data. */
for (i = 0; i < order; i++)
- fp->state[i] = get_sbits(gbp, state_bits) << state_shift;
+ fp->state[i] = bitstream_read_signed(bc, state_bits) << state_shift;
}
}
/** Read parameters for primitive matrices. */
-static int read_matrix_params(MLPDecodeContext *m, unsigned int substr, GetBitContext *gbp)
+static int read_matrix_params(MLPDecodeContext *m, unsigned int substr,
+ BitstreamContext *bc)
{
SubStream *s = &m->substream[substr];
unsigned int mat, ch;
return AVERROR_INVALIDDATA;
}
- s->num_primitive_matrices = get_bits(gbp, 4);
+ s->num_primitive_matrices = bitstream_read(bc, 4);
if (s->num_primitive_matrices > max_primitive_matrices) {
av_log(m->avctx, AV_LOG_ERROR,
for (mat = 0; mat < s->num_primitive_matrices; mat++) {
int frac_bits, max_chan;
- s->matrix_out_ch[mat] = get_bits(gbp, 4);
- frac_bits = get_bits(gbp, 4);
- s->lsb_bypass [mat] = get_bits1(gbp);
+ s->matrix_out_ch[mat] = bitstream_read(bc, 4);
+ frac_bits = bitstream_read(bc, 4);
+ s->lsb_bypass[mat] = bitstream_read_bit(bc);
if (s->matrix_out_ch[mat] > s->max_matrix_channel) {
av_log(m->avctx, AV_LOG_ERROR,
for (ch = 0; ch <= max_chan; ch++) {
int coeff_val = 0;
- if (get_bits1(gbp))
- coeff_val = get_sbits(gbp, frac_bits + 2);
+ if (bitstream_read_bit(bc))
+ coeff_val = bitstream_read_signed(bc, frac_bits + 2);
s->matrix_coeff[mat][ch] = coeff_val << (14 - frac_bits);
}
if (s->noise_type)
- s->matrix_noise_shift[mat] = get_bits(gbp, 4);
+ s->matrix_noise_shift[mat] = bitstream_read(bc, 4);
else
s->matrix_noise_shift[mat] = 0;
}
/** Read channel parameters. */
static int read_channel_params(MLPDecodeContext *m, unsigned int substr,
- GetBitContext *gbp, unsigned int ch)
+ BitstreamContext *bc, unsigned int ch)
{
SubStream *s = &m->substream[substr];
ChannelParams *cp = &s->channel_params[ch];
int ret;
if (s->param_presence_flags & PARAM_FIR)
- if (get_bits1(gbp))
- if ((ret = read_filter_params(m, gbp, substr, ch, FIR)) < 0)
+ if (bitstream_read_bit(bc))
+ if ((ret = read_filter_params(m, bc, substr, ch, FIR)) < 0)
return ret;
if (s->param_presence_flags & PARAM_IIR)
- if (get_bits1(gbp))
- if ((ret = read_filter_params(m, gbp, substr, ch, IIR)) < 0)
+ if (bitstream_read_bit(bc))
+ if ((ret = read_filter_params(m, bc, substr, ch, IIR)) < 0)
return ret;
if (fir->order + iir->order > 8) {
fir->shift = iir->shift;
if (s->param_presence_flags & PARAM_HUFFOFFSET)
- if (get_bits1(gbp))
- cp->huff_offset = get_sbits(gbp, 15);
+ if (bitstream_read_bit(bc))
+ cp->huff_offset = bitstream_read_signed(bc, 15);
- cp->codebook = get_bits(gbp, 2);
- cp->huff_lsbs = get_bits(gbp, 5);
+ cp->codebook = bitstream_read(bc, 2);
+ cp->huff_lsbs = bitstream_read(bc, 5);
if (cp->huff_lsbs > 24) {
av_log(m->avctx, AV_LOG_ERROR, "Invalid huff_lsbs.\n");
/** Read decoding parameters that change more often than those in the restart
* header. */
-static int read_decoding_params(MLPDecodeContext *m, GetBitContext *gbp,
+static int read_decoding_params(MLPDecodeContext *m, BitstreamContext *bc,
unsigned int substr)
{
SubStream *s = &m->substream[substr];
int ret;
if (s->param_presence_flags & PARAM_PRESENCE)
- if (get_bits1(gbp))
- s->param_presence_flags = get_bits(gbp, 8);
+ if (bitstream_read_bit(bc))
+ s->param_presence_flags = bitstream_read(bc, 8);
if (s->param_presence_flags & PARAM_BLOCKSIZE)
- if (get_bits1(gbp)) {
- s->blocksize = get_bits(gbp, 9);
+ if (bitstream_read_bit(bc)) {
+ s->blocksize = bitstream_read(bc, 9);
if (s->blocksize < 8 || s->blocksize > m->access_unit_size) {
av_log(m->avctx, AV_LOG_ERROR, "Invalid blocksize.");
s->blocksize = 0;
}
if (s->param_presence_flags & PARAM_MATRIX)
- if (get_bits1(gbp))
- if ((ret = read_matrix_params(m, substr, gbp)) < 0)
+ if (bitstream_read_bit(bc))
+ if ((ret = read_matrix_params(m, substr, bc)) < 0)
return ret;
if (s->param_presence_flags & PARAM_OUTSHIFT)
- if (get_bits1(gbp)) {
+ if (bitstream_read_bit(bc)) {
for (ch = 0; ch <= s->max_matrix_channel; ch++)
- s->output_shift[ch] = get_sbits(gbp, 4);
+ s->output_shift[ch] = bitstream_read_signed(bc, 4);
if (substr == m->max_decoded_substream)
m->dsp.mlp_pack_output = m->dsp.mlp_select_pack_output(s->ch_assign,
s->output_shift,
}
if (s->param_presence_flags & PARAM_QUANTSTEP)
- if (get_bits1(gbp))
+ if (bitstream_read_bit(bc))
for (ch = 0; ch <= s->max_channel; ch++) {
ChannelParams *cp = &s->channel_params[ch];
- s->quant_step_size[ch] = get_bits(gbp, 4);
+ s->quant_step_size[ch] = bitstream_read(bc, 4);
cp->sign_huff_offset = calculate_sign_huff(m, substr, ch);
}
for (ch = s->min_channel; ch <= s->max_channel; ch++)
- if (get_bits1(gbp))
- if ((ret = read_channel_params(m, substr, gbp, ch)) < 0)
+ if (bitstream_read_bit(bc))
+ if ((ret = read_channel_params(m, substr, bc, ch)) < 0)
return ret;
return 0;
/** Read a block of PCM residual data (or actual if no filtering active). */
-static int read_block_data(MLPDecodeContext *m, GetBitContext *gbp,
+static int read_block_data(MLPDecodeContext *m, BitstreamContext *bc,
unsigned int substr)
{
SubStream *s = &m->substream[substr];
int ret;
if (s->data_check_present) {
- expected_stream_pos = get_bits_count(gbp);
- expected_stream_pos += get_bits(gbp, 16);
+ expected_stream_pos = bitstream_tell(bc);
+ expected_stream_pos += bitstream_read(bc, 16);
avpriv_request_sample(m->avctx,
"Substreams with VLC block size check info");
}
s->blocksize * sizeof(m->bypassed_lsbs[0]));
for (i = 0; i < s->blocksize; i++)
- if ((ret = read_huff_channels(m, gbp, substr, i)) < 0)
+ if ((ret = read_huff_channels(m, bc, substr, i)) < 0)
return ret;
for (ch = s->min_channel; ch <= s->max_channel; ch++)
s->blockpos += s->blocksize;
if (s->data_check_present) {
- if (get_bits_count(gbp) != expected_stream_pos)
+ if (bitstream_tell(bc) != expected_stream_pos)
av_log(m->avctx, AV_LOG_ERROR, "block data length mismatch\n");
- skip_bits(gbp, 8);
+ bitstream_skip(bc, 8);
}
return 0;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
MLPDecodeContext *m = avctx->priv_data;
- GetBitContext gb;
+ BitstreamContext bc;
unsigned int length, substr;
unsigned int substream_start;
unsigned int header_size = 4;
if (length < 4 || length > buf_size)
return AVERROR_INVALIDDATA;
- init_get_bits(&gb, (buf + 4), (length - 4) * 8);
+ bitstream_init8(&bc, buf + 4, length - 4);
m->is_major_sync_unit = 0;
- if (show_bits_long(&gb, 31) == (0xf8726fba >> 1)) {
- if (read_major_sync(m, &gb) < 0)
+ if (bitstream_peek(&bc, 31) == (0xf8726fba >> 1)) {
+ if (read_major_sync(m, &bc) < 0)
goto error;
m->is_major_sync_unit = 1;
- header_size += 28;
+ header_size += m->major_sync_header_size;
}
if (!m->params_valid) {
for (substr = 0; substr < m->num_substreams; substr++) {
int extraword_present, checkdata_present, end, nonrestart_substr;
- extraword_present = get_bits1(&gb);
- nonrestart_substr = get_bits1(&gb);
- checkdata_present = get_bits1(&gb);
- skip_bits1(&gb);
+ extraword_present = bitstream_read_bit(&bc);
+ nonrestart_substr = bitstream_read_bit(&bc);
+ checkdata_present = bitstream_read_bit(&bc);
+ bitstream_skip(&bc, 1);
- end = get_bits(&gb, 12) * 2;
+ end = bitstream_read(&bc, 12) * 2;
substr_header_size += 2;
av_log(m->avctx, AV_LOG_ERROR, "There must be no extraword for MLP.\n");
goto error;
}
- skip_bits(&gb, 16);
+ bitstream_skip(&bc, 16);
substr_header_size += 2;
}
for (substr = 0; substr <= m->max_decoded_substream; substr++) {
SubStream *s = &m->substream[substr];
- init_get_bits(&gb, buf, substream_data_len[substr] * 8);
+ bitstream_init8(&bc, buf, substream_data_len[substr]);
m->matrix_changed = 0;
memset(m->filter_changed, 0, sizeof(m->filter_changed));
s->blockpos = 0;
do {
- if (get_bits1(&gb)) {
- if (get_bits1(&gb)) {
+ if (bitstream_read_bit(&bc)) {
+ if (bitstream_read_bit(&bc)) {
/* A restart header should be present. */
- if (read_restart_header(m, &gb, buf, substr) < 0)
+ if (read_restart_header(m, &bc, buf, substr) < 0)
goto next_substr;
s->restart_seen = 1;
}
if (!s->restart_seen)
goto next_substr;
- if (read_decoding_params(m, &gb, substr) < 0)
+ if (read_decoding_params(m, &bc, substr) < 0)
goto next_substr;
}
if (!s->restart_seen)
goto next_substr;
- if ((ret = read_block_data(m, &gb, substr)) < 0)
+ if ((ret = read_block_data(m, &bc, substr)) < 0)
return ret;
- if (get_bits_count(&gb) >= substream_data_len[substr] * 8)
+ if (bitstream_tell(&bc) >= substream_data_len[substr] * 8)
goto substream_length_mismatch;
- } while (!get_bits1(&gb));
+ } while (!bitstream_read_bit(&bc));
- skip_bits(&gb, (-get_bits_count(&gb)) & 15);
+ bitstream_skip(&bc, (-bitstream_tell(&bc)) & 15);
- if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 32) {
+ if (substream_data_len[substr] * 8 - bitstream_tell(&bc) >= 32) {
int shorten_by;
- if (get_bits(&gb, 16) != 0xD234)
+ if (bitstream_read(&bc, 16) != 0xD234)
return AVERROR_INVALIDDATA;
- shorten_by = get_bits(&gb, 16);
+ shorten_by = bitstream_read(&bc, 16);
if (m->avctx->codec_id == AV_CODEC_ID_TRUEHD && shorten_by & 0x2000)
s->blockpos -= FFMIN(shorten_by & 0x1FFF, s->blockpos);
else if (m->avctx->codec_id == AV_CODEC_ID_MLP && shorten_by != 0xD234)
if (substream_parity_present[substr]) {
uint8_t parity, checksum;
- if (substream_data_len[substr] * 8 - get_bits_count(&gb) != 16)
+ if (substream_data_len[substr] * 8 - bitstream_tell(&bc) != 16)
goto substream_length_mismatch;
parity = ff_mlp_calculate_parity(buf, substream_data_len[substr] - 2);
checksum = ff_mlp_checksum8 (buf, substream_data_len[substr] - 2);
- if ((get_bits(&gb, 8) ^ parity) != 0xa9 )
+ if ((bitstream_read(&bc, 8) ^ parity) != 0xa9)
av_log(m->avctx, AV_LOG_ERROR, "Substream %d parity check failed.\n", substr);
- if ( get_bits(&gb, 8) != checksum)
+ if (bitstream_read(&bc, 8) != checksum)
av_log(m->avctx, AV_LOG_ERROR, "Substream %d checksum failed.\n" , substr);
}
- if (substream_data_len[substr] * 8 != get_bits_count(&gb))
+ if (substream_data_len[substr] * 8 != bitstream_tell(&bc))
goto substream_length_mismatch;
next_substr:
.priv_data_size = sizeof(MLPDecodeContext),
.init = mlp_decode_init,
.decode = read_access_unit,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#if CONFIG_TRUEHD_DECODER
.priv_data_size = sizeof(MLPDecodeContext),
.init = mlp_decode_init,
.decode = read_access_unit,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
#endif /* CONFIG_TRUEHD_DECODER */
projects / ffmpeg / blobdiff