aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-05 22:43:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-06 01:08:33 +0200
commitad60b3b1811f6fce23baf8cf081f469244004aae (patch)
tree940b8fe92e81801860c5d010d3031e51cd02511a /libavcodec
parent647e2e070f0dbb7055c3a1443de0f5ed3292e0cc (diff)
parentecf79c4d3e8baaf2f303278ef81db6f8407656bc (diff)
downloadffmpeg-ad60b3b1811f6fce23baf8cf081f469244004aae.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile1
-rw-r--r--libavcodec/aacdec.c3
-rw-r--r--libavcodec/allcodecs.c1
-rw-r--r--libavcodec/avcodec.h1
-rw-r--r--libavcodec/imc.c478
-rw-r--r--libavcodec/imcdata.h19
-rw-r--r--libavcodec/mpc8.c6
-rw-r--r--libavcodec/version.h2
-rw-r--r--libavcodec/vorbis.c9
-rw-r--r--libavcodec/vorbis.h3
-rw-r--r--libavcodec/vorbisdec.c12
-rw-r--r--libavcodec/vorbisenc.c3
12 files changed, 325 insertions, 213 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c83b5f52c9..20f330ca57 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -220,6 +220,7 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o
OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
+OBJS-$(CONFIG_IAC_DECODER) += imc.o
OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o
OBJS-$(CONFIG_IDF_DECODER) += bintext.o cga_data.o
OBJS-$(CONFIG_IFF_BYTERUN1_DECODER) += iff.o
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index b38ed7ed5c..4d4291dc50 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -487,6 +487,7 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
return NULL;
ac->oc[1].m4ac.chan_config = 2;
+ ac->oc[1].m4ac.ps = 0;
}
// And vice-versa
if (!ac->tags_mapped && type == TYPE_SCE && ac->oc[1].m4ac.chan_config == 2) {
@@ -504,6 +505,8 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
return NULL;
ac->oc[1].m4ac.chan_config = 1;
+ if (ac->oc[1].m4ac.sbr)
+ ac->oc[1].m4ac.ps = -1;
}
// For indexed channel configurations map the channels solely based on position.
switch (ac->oc[1].m4ac.chan_config) {
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index ac05b9bb55..4067537403 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -286,6 +286,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (G729, g729);
REGISTER_DECODER (GSM, gsm);
REGISTER_DECODER (GSM_MS, gsm_ms);
+ REGISTER_DECODER (IAC, iac);
REGISTER_DECODER (IMC, imc);
REGISTER_DECODER (MACE3, mace3);
REGISTER_DECODER (MACE6, mace6);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e61aabcb72..e2b754f04c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -406,6 +406,7 @@ enum CodecID {
CODEC_ID_8SVX_FIB,
CODEC_ID_BMV_AUDIO,
CODEC_ID_RALF,
+ CODEC_ID_IAC,
CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'),
CODEC_ID_SONIC = MKBETAG('S','O','N','C'),
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 4c158e6171..1af6bd9c93 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -49,9 +49,7 @@
#define BANDS 32
#define COEFFS 256
-typedef struct {
- AVFrame frame;
-
+typedef struct IMCChannel {
float old_floor[BANDS];
float flcoeffs1[BANDS];
float flcoeffs2[BANDS];
@@ -61,16 +59,6 @@ typedef struct {
float flcoeffs6[BANDS];
float CWdecoded[COEFFS];
- /** MDCT tables */
- //@{
- float mdct_sine_window[COEFFS];
- float post_cos[COEFFS];
- float post_sin[COEFFS];
- float pre_coef1[COEFFS];
- float pre_coef2[COEFFS];
- float last_fft_im[COEFFS];
- //@}
-
int bandWidthT[BANDS]; ///< codewords per band
int bitsBandT[BANDS]; ///< how many bits per codeword in band
int CWlengthT[COEFFS]; ///< how many bits in each codeword
@@ -82,15 +70,37 @@ typedef struct {
int skipFlagCount[BANDS]; ///< skipped coeffients per band
int skipFlags[COEFFS]; ///< skip coefficient decoding or not
int codewords[COEFFS]; ///< raw codewords read from bitstream
+
+ float last_fft_im[COEFFS];
+
+ int decoder_reset;
+} IMCChannel;
+
+typedef struct {
+ AVFrame frame;
+
+ IMCChannel chctx[2];
+
+ /** MDCT tables */
+ //@{
+ float mdct_sine_window[COEFFS];
+ float post_cos[COEFFS];
+ float post_sin[COEFFS];
+ float pre_coef1[COEFFS];
+ float pre_coef2[COEFFS];
+ //@}
+
float sqrt_tab[30];
GetBitContext gb;
- int decoder_reset;
float one_div_log2;
DSPContext dsp;
FFTContext fft;
DECLARE_ALIGNED(32, FFTComplex, samples)[COEFFS / 2];
float *out_samples;
+
+ int8_t cyclTab[32], cyclTab2[32];
+ float weights1[31], weights2[31];
} IMCContext;
static VLC huffman_vlc[4][4];
@@ -110,15 +120,21 @@ static av_cold int imc_decode_init(AVCodecContext *avctx)
IMCContext *q = avctx->priv_data;
double r1, r2;
- if (avctx->channels != 1) {
+ if ((avctx->codec_id == CODEC_ID_IMC && avctx->channels != 1)
+ || (avctx->codec_id == CODEC_ID_IAC && avctx->channels > 2)) {
av_log_ask_for_sample(avctx, "Number of channels is not supported\n");
return AVERROR_PATCHWELCOME;
}
- q->decoder_reset = 1;
+ for (j = 0; j < avctx->channels; j++) {
+ q->chctx[j].decoder_reset = 1;
- for (i = 0; i < BANDS; i++)
- q->old_floor[i] = 1.0;
+ for (i = 0; i < BANDS; i++)
+ q->chctx[j].old_floor[i] = 1.0;
+
+ for (i = 0; i < COEFFS / 2; i++)
+ q->chctx[j].last_fft_im[i] = 0;
+ }
/* Build mdct window, a simple sine window normalized with sqrt(2) */
ff_sine_window_init(q->mdct_sine_window, COEFFS);
@@ -138,8 +154,6 @@ static av_cold int imc_decode_init(AVCodecContext *avctx)
q->pre_coef1[i] = -(r1 + r2) * sqrt(2.0);
q->pre_coef2[i] = (r1 - r2) * sqrt(2.0);
}
-
- q->last_fft_im[i] = 0;
}
/* Generate a square root table */
@@ -159,13 +173,26 @@ static av_cold int imc_decode_init(AVCodecContext *avctx)
}
q->one_div_log2 = 1 / log(2);
+ memcpy(q->cyclTab, cyclTab, sizeof(cyclTab));
+ memcpy(q->cyclTab2, cyclTab2, sizeof(cyclTab2));
+ if (avctx->codec_id == CODEC_ID_IAC) {
+ q->cyclTab[29] = 31;
+ q->cyclTab2[31] = 28;
+ memcpy(q->weights1, iac_weights1, sizeof(iac_weights1));
+ memcpy(q->weights2, iac_weights2, sizeof(iac_weights2));
+ } else {
+ memcpy(q->weights1, imc_weights1, sizeof(imc_weights1));
+ memcpy(q->weights2, imc_weights2, sizeof(imc_weights2));
+ }
+
if ((ret = ff_fft_init(&q->fft, 7, 1))) {
av_log(avctx, AV_LOG_INFO, "FFT init failed\n");
return ret;
}
ff_dsputil_init(&q->dsp, avctx);
- avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
- avctx->channel_layout = AV_CH_LAYOUT_MONO;
+ avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
+ avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO
+ : AV_CH_LAYOUT_STEREO;
avcodec_get_frame_defaults(&q->frame);
avctx->coded_frame = &q->frame;
@@ -199,13 +226,13 @@ static void imc_calculate_coeffs(IMCContext *q, float *flcoeffs1,
}
for (i = 0; i < BANDS; i++) {
- for (cnt2 = i; cnt2 < cyclTab[i]; cnt2++)
+ for (cnt2 = i; cnt2 < q->cyclTab[i]; cnt2++)
flcoeffs5[cnt2] = flcoeffs5[cnt2] + workT3[i];
workT2[cnt2 - 1] = workT2[cnt2 - 1] + workT3[i];
}
for (i = 1; i < BANDS; i++) {
- accum = (workT2[i - 1] + accum) * imc_weights1[i - 1];
+ accum = (workT2[i - 1] + accum) * q->weights1[i - 1];
flcoeffs5[i] += accum;
}
@@ -213,7 +240,7 @@ static void imc_calculate_coeffs(IMCContext *q, float *flcoeffs1,
workT2[i] = 0.0;
for (i = 0; i < BANDS; i++) {
- for (cnt2 = i - 1; cnt2 > cyclTab2[i]; cnt2--)
+ for (cnt2 = i - 1; cnt2 > q->cyclTab2[i]; cnt2--)
flcoeffs5[cnt2] += workT3[i];
workT2[cnt2+1] += workT3[i];
}
@@ -221,7 +248,7 @@ static void imc_calculate_coeffs(IMCContext *q, float *flcoeffs1,
accum = 0.0;
for (i = BANDS-2; i >= 0; i--) {
- accum = (workT2[i+1] + accum) * imc_weights2[i];
+ accum = (workT2[i+1] + accum) * q->weights2[i];
flcoeffs5[i] += accum;
// there is missing code here, but it seems to never be triggered
}
@@ -313,8 +340,8 @@ static void imc_decode_level_coefficients2(IMCContext *q, int *levlCoeffBuf,
/**
* Perform bit allocation depending on bits available
*/
-static int bit_allocation(IMCContext *q, int stream_format_code, int freebits,
- int flag)
+static int bit_allocation(IMCContext *q, IMCChannel *chctx,
+ int stream_format_code, int freebits, int flag)
{
int i, j;
const float limit = -1.e20;
@@ -333,43 +360,43 @@ static int bit_allocation(IMCContext *q, int stream_format_code, int freebits,
int found_indx = 0;
for (i = 0; i < BANDS; i++)
- highest = FFMAX(highest, q->flcoeffs1[i]);
+ highest = FFMAX(highest, chctx->flcoeffs1[i]);
for (i = 0; i < BANDS - 1; i++)
- q->flcoeffs4[i] = q->flcoeffs3[i] - log(q->flcoeffs5[i]) / log(2);
- q->flcoeffs4[BANDS - 1] = limit;
+ chctx->flcoeffs4[i] = chctx->flcoeffs3[i] - log(chctx->flcoeffs5[i]) / log(2);
+ chctx->flcoeffs4[BANDS - 1] = limit;
highest = highest * 0.25;
for (i = 0; i < BANDS; i++) {
indx = -1;
- if ((band_tab[i + 1] - band_tab[i]) == q->bandWidthT[i])
+ if ((band_tab[i + 1] - band_tab[i]) == chctx->bandWidthT[i])
indx = 0;
- if ((band_tab[i + 1] - band_tab[i]) > q->bandWidthT[i])
+ if ((band_tab[i + 1] - band_tab[i]) > chctx->bandWidthT[i])
indx = 1;
- if (((band_tab[i + 1] - band_tab[i]) / 2) >= q->bandWidthT[i])
+ if (((band_tab[i + 1] - band_tab[i]) / 2) >= chctx->bandWidthT[i])
indx = 2;
if (indx == -1)
return AVERROR_INVALIDDATA;
- q->flcoeffs4[i] += xTab[(indx * 2 + (q->flcoeffs1[i] < highest)) * 2 + flag];
+ chctx->flcoeffs4[i] += xTab[(indx * 2 + (chctx->flcoeffs1[i] < highest)) * 2 + flag];
}
if (stream_format_code & 0x2) {
- q->flcoeffs4[0] = limit;
- q->flcoeffs4[1] = limit;
- q->flcoeffs4[2] = limit;
- q->flcoeffs4[3] = limit;
+ chctx->flcoeffs4[0] = limit;
+ chctx->flcoeffs4[1] = limit;
+ chctx->flcoeffs4[2] = limit;
+ chctx->flcoeffs4[3] = limit;
}
for (i = (stream_format_code & 0x2) ? 4 : 0; i < BANDS - 1; i++) {
- iacc += q->bandWidthT[i];
- summa += q->bandWidthT[i] * q->flcoeffs4[i];
+ iacc += chctx->bandWidthT[i];
+ summa += chctx->bandWidthT[i] * chctx->flcoeffs4[i];
}
- q->bandWidthT[BANDS - 1] = 0;
+ chctx->bandWidthT[BANDS - 1] = 0;
summa = (summa * 0.5 - freebits) / iacc;
@@ -382,13 +409,13 @@ static int bit_allocation(IMCContext *q, int stream_format_code, int freebits,
iacc = 0;
for (j = (stream_format_code & 0x2) ? 4 : 0; j < BANDS; j++) {
- cwlen = av_clipf(((q->flcoeffs4[j] * 0.5) - summa + 0.5), 0, 6);
+ cwlen = av_clipf(((chctx->flcoeffs4[j] * 0.5) - summa + 0.5), 0, 6);
- q->bitsBandT[j] = cwlen;
- summer += q->bandWidthT[j] * cwlen;
+ chctx->bitsBandT[j] = cwlen;
+ summer += chctx->bandWidthT[j] * cwlen;
if (cwlen > 0)
- iacc += q->bandWidthT[j];
+ iacc += chctx->bandWidthT[j];
}
flg = t2;
@@ -405,13 +432,13 @@ static int bit_allocation(IMCContext *q, int stream_format_code, int freebits,
for (i = (stream_format_code & 0x2) ? 4 : 0; i < BANDS; i++) {
for (j = band_tab[i]; j < band_tab[i + 1]; j++)
- q->CWlengthT[j] = q->bitsBandT[i];
+ chctx->CWlengthT[j] = chctx->bitsBandT[i];
}
if (freebits > summer) {
for (i = 0; i < BANDS; i++) {
- workT[i] = (q->bitsBandT[i] == 6) ? -1.e20
- : (q->bitsBandT[i] * -2 + q->flcoeffs4[i] - 0.415);
+ workT[i] = (chctx->bitsBandT[i] == 6) ? -1.e20
+ : (chctx->bitsBandT[i] * -2 + chctx->flcoeffs4[i] - 0.415);
}
highest = 0.0;
@@ -432,11 +459,11 @@ static int bit_allocation(IMCContext *q, int stream_format_code, int freebits,
if (highest > -1.e20) {
workT[found_indx] -= 2.0;
- if (++q->bitsBandT[found_indx] == 6)
+ if (++chctx->bitsBandT[found_indx] == 6)
workT[found_indx] = -1.e20;
for (j = band_tab[found_indx]; j < band_tab[found_indx + 1] && (freebits > summer); j++) {
- q->CWlengthT[j]++;
+ chctx->CWlengthT[j]++;
summer++;
}
}
@@ -444,7 +471,7 @@ static int bit_allocation(IMCContext *q, int stream_format_code, int freebits,
}
if (freebits < summer) {
for (i = 0; i < BANDS; i++) {
- workT[i] = q->bitsBandT[i] ? (q->bitsBandT[i] * -2 + q->flcoeffs4[i] + 1.585)
+ workT[i] = chctx->bitsBandT[i] ? (chctx->bitsBandT[i] * -2 + chctx->flcoeffs4[i] + 1.585)
: 1.e20;
}
if (stream_format_code & 0x2) {
@@ -466,12 +493,12 @@ static int bit_allocation(IMCContext *q, int stream_format_code, int freebits,
// break;
workT[low_indx] = lowest + 2.0;
- if (!--q->bitsBandT[low_indx])
+ if (!--chctx->bitsBandT[low_indx])
workT[low_indx] = 1.e20;
for (j = band_tab[low_indx]; j < band_tab[low_indx+1] && (freebits < summer); j++) {
- if (q->CWlengthT[j] > 0) {
- q->CWlengthT[j]--;
+ if (chctx->CWlengthT[j] > 0) {
+ chctx->CWlengthT[j]--;
summer--;
}
}
@@ -480,54 +507,54 @@ static int bit_allocation(IMCContext *q, int stream_format_code, int freebits,
return 0;
}
-static void imc_get_skip_coeff(IMCContext *q)
+static void imc_get_skip_coeff(IMCContext *q, IMCChannel *chctx)
{
int i, j;
- memset(q->skipFlagBits, 0, sizeof(q->skipFlagBits));
- memset(q->skipFlagCount, 0, sizeof(q->skipFlagCount));
+ memset(chctx->skipFlagBits, 0, sizeof(chctx->skipFlagBits));
+ memset(chctx->skipFlagCount, 0, sizeof(chctx->skipFlagCount));
for (i = 0; i < BANDS; i++) {
- if (!q->bandFlagsBuf[i] || !q->bandWidthT[i])
+ if (!chctx->bandFlagsBuf[i] || !chctx->bandWidthT[i])
continue;
- if (!q->skipFlagRaw[i]) {
- q->skipFlagBits[i] = band_tab[i + 1] - band_tab[i];
+ if (!chctx->skipFlagRaw[i]) {
+ chctx->skipFlagBits[i] = band_tab[i + 1] - band_tab[i];
for (j = band_tab[i]; j < band_tab[i + 1]; j++) {
- q->skipFlags[j] = get_bits1(&q->gb);
- if (q->skipFlags[j])
- q->skipFlagCount[i]++;
+ chctx->skipFlags[j] = get_bits1(&q->gb);
+ if (chctx->skipFlags[j])
+ chctx->skipFlagCount[i]++;
}
} else {
for (j = band_tab[i]; j < band_tab[i + 1] - 1; j += 2) {
if (!get_bits1(&q->gb)) { // 0
- q->skipFlagBits[i]++;
- q->skipFlags[j] = 1;
- q->skipFlags[j + 1] = 1;
- q->skipFlagCount[i] += 2;
+ chctx->skipFlagBits[i]++;
+ chctx->skipFlags[j] = 1;
+ chctx->skipFlags[j + 1] = 1;
+ chctx->skipFlagCount[i] += 2;
} else {
if (get_bits1(&q->gb)) { // 11
- q->skipFlagBits[i] += 2;
- q->skipFlags[j] = 0;
- q->skipFlags[j + 1] = 1;
- q->skipFlagCount[i]++;
+ chctx->skipFlagBits[i] += 2;
+ chctx->skipFlags[j] = 0;
+ chctx->skipFlags[j + 1] = 1;
+ chctx->skipFlagCount[i]++;
} else {
- q->skipFlagBits[i] += 3;
- q->skipFlags[j + 1] = 0;
+ chctx->skipFlagBits[i] += 3;
+ chctx->skipFlags[j + 1] = 0;
if (!get_bits1(&q->gb)) { // 100
- q->skipFlags[j] = 1;
- q->skipFlagCount[i]++;
+ chctx->skipFlags[j] = 1;
+ chctx->skipFlagCount[i]++;
} else { // 101
- q->skipFlags[j] = 0;
+ chctx->skipFlags[j] = 0;
}
}
}
}
if (j < band_tab[i + 1]) {
- q->skipFlagBits[i]++;
- if ((q->skipFlags[j] = get_bits1(&q->gb)))
- q->skipFlagCount[i]++;
+ chctx->skipFlagBits[i]++;
+ if ((chctx->skipFlags[j] = get_bits1(&q->gb)))
+ chctx->skipFlagCount[i]++;
}
}
}
@@ -536,7 +563,8 @@ static void imc_get_skip_coeff(IMCContext *q)
/**
* Increase highest' band coefficient sizes as some bits won't be used
*/
-static void imc_adjust_bit_allocation(IMCContext *q, int summer)
+static void imc_adjust_bit_allocation(IMCContext *q, IMCChannel *chctx,
+ int summer)
{
float workT[32];
int corrected = 0;
@@ -545,8 +573,8 @@ static void imc_adjust_bit_allocation(IMCContext *q, int summer)
int found_indx = 0;
for (i = 0; i < BANDS; i++) {
- workT[i] = (q->bitsBandT[i] == 6) ? -1.e20
- : (q->bitsBandT[i] * -2 + q->flcoeffs4[i] - 0.415);
+ workT[i] = (chctx->bitsBandT[i] == 6) ? -1.e20
+ : (chctx->bitsBandT[i] * -2 + chctx->flcoeffs4[i] - 0.415);
}
while (corrected < summer) {
@@ -564,12 +592,12 @@ static void imc_adjust_bit_allocation(IMCContext *q, int summer)
if (highest > -1.e20) {
workT[found_indx] -= 2.0;
- if (++(q->bitsBandT[found_indx]) == 6)
+ if (++(chctx->bitsBandT[found_indx]) == 6)
workT[found_indx] = -1.e20;
for (j = band_tab[found_indx]; j < band_tab[found_indx+1] && (corrected < summer); j++) {
- if (!q->skipFlags[j] && (q->CWlengthT[j] < 6)) {
- q->CWlengthT[j]++;
+ if (!chctx->skipFlags[j] && (chctx->CWlengthT[j] < 6)) {
+ chctx->CWlengthT[j]++;
corrected++;
}
}
@@ -577,17 +605,19 @@ static void imc_adjust_bit_allocation(IMCContext *q, int summer)
}
}
-static void imc_imdct256(IMCContext *q)
+static void imc_imdct256(IMCContext *q, IMCChannel *chctx, int channels)
{
int i;
float re, im;
+ float *dst1 = q->out_samples;
+ float *dst2 = q->out_samples + (COEFFS - 1) * channels;
/* prerotation */
for (i = 0; i < COEFFS / 2; i++) {
- q->samples[i].re = -(q->pre_coef1[i] * q->CWdecoded[COEFFS - 1 - i * 2]) -
- (q->pre_coef2[i] * q->CWdecoded[i * 2]);
- q->samples[i].im = (q->pre_coef2[i] * q->CWdecoded[COEFFS - 1 - i * 2]) -
- (q->pre_coef1[i] * q->CWdecoded[i * 2]);
+ q->samples[i].re = -(q->pre_coef1[i] * chctx->CWdecoded[COEFFS - 1 - i * 2]) -
+ (q->pre_coef2[i] * chctx->CWdecoded[i * 2]);
+ q->samples[i].im = (q->pre_coef2[i] * chctx->CWdecoded[COEFFS - 1 - i * 2]) -
+ (q->pre_coef1[i] * chctx->CWdecoded[i * 2]);
}
/* FFT */
@@ -598,15 +628,18 @@ static void imc_imdct256(IMCContext *q)
for (i = 0; i < COEFFS / 2; i++) {
re = ( q->samples[i].re * q->post_cos[i]) + (-q->samples[i].im * q->post_sin[i]);
im = (-q->samples[i].im * q->post_cos[i]) - ( q->samples[i].re * q->post_sin[i]);
- q->out_samples[i * 2] = (q->mdct_sine_window[COEFFS - 1 - i * 2] * q->last_fft_im[i])
- + (q->mdct_sine_window[i * 2] * re);
- q->out_samples[COEFFS - 1 - i * 2] = (q->mdct_sine_window[i * 2] * q->last_fft_im[i])
- - (q->mdct_sine_window[COEFFS - 1 - i * 2] * re);
- q->last_fft_im[i] = im;
+ *dst1 = (q->mdct_sine_window[COEFFS - 1 - i * 2] * chctx->last_fft_im[i])
+ + (q->mdct_sine_window[i * 2] * re);
+ *dst2 = (q->mdct_sine_window[i * 2] * chctx->last_fft_im[i])
+ - (q->mdct_sine_window[COEFFS - 1 - i * 2] * re);
+ dst1 += channels * 2;
+ dst2 -= channels * 2;
+ chctx->last_fft_im[i] = im;
}
}
-static int inverse_quant_coeff(IMCContext *q, int stream_format_code)
+static int inverse_quant_coeff(IMCContext *q, IMCChannel *chctx,
+ int stream_format_code)
{
int i, j;
int middle_value, cw_len, max_size;
@@ -614,30 +647,30 @@ static int inverse_quant_coeff(IMCContext *q, int stream_format_code)
for (i = 0; i < BANDS; i++) {
for (j = band_tab[i]; j < band_tab[i + 1]; j++) {
- q->CWdecoded[j] = 0;
- cw_len = q->CWlengthT[j];
+ chctx->CWdecoded[j] = 0;
+ cw_len = chctx->CWlengthT[j];
- if (cw_len <= 0 || q->skipFlags[j])
+ if (cw_len <= 0 || chctx->skipFlags[j])
continue;
max_size = 1 << cw_len;
middle_value = max_size >> 1;
- if (q->codewords[j] >= max_size || q->codewords[j] < 0)
+ if (chctx->codewords[j] >= max_size || chctx->codewords[j] < 0)
return AVERROR_INVALIDDATA;
if (cw_len >= 4) {
quantizer = imc_quantizer2[(stream_format_code & 2) >> 1];
- if (q->codewords[j] >= middle_value)
- q->CWdecoded[j] = quantizer[q->codewords[j] - 8] * q->flcoeffs6[i];
+ if (chctx->codewords[j] >= middle_value)
+ chctx->CWdecoded[j] = quantizer[chctx->codewords[j] - 8] * chctx->flcoeffs6[i];
else
- q->CWdecoded[j] = -quantizer[max_size - q->codewords[j] - 8 - 1] * q->flcoeffs6[i];
+ chctx->CWdecoded[j] = -quantizer[max_size - chctx->codewords[j] - 8 - 1] * chctx->flcoeffs6[i];
}else{
- quantizer = imc_quantizer1[((stream_format_code & 2) >> 1) | (q->bandFlagsBuf[i] << 1)];
- if (q->codewords[j] >= middle_value)
- q->CWdecoded[j] = quantizer[q->codewords[j] - 1] * q->flcoeffs6[i];
+ quantizer = imc_quantizer1[((stream_format_code & 2) >> 1) | (chctx->bandFlagsBuf[i] << 1)];
+ if (chctx->codewords[j] >= middle_value)
+ chctx->CWdecoded[j] = quantizer[chctx->codewords[j] - 1] * chctx->flcoeffs6[i];
else
- q->CWdecoded[j] = -quantizer[max_size - 2 - q->codewords[j]] * q->flcoeffs6[i];
+ chctx->CWdecoded[j] = -quantizer[max_size - 2 - chctx->codewords[j]] * chctx->flcoeffs6[i];
}
}
}
@@ -645,16 +678,16 @@ static int inverse_quant_coeff(IMCContext *q, int stream_format_code)
}
-static int imc_get_coeffs(IMCContext *q)
+static int imc_get_coeffs(IMCContext *q, IMCChannel *chctx)
{
int i, j, cw_len, cw;
for (i = 0; i < BANDS; i++) {
- if (!q->sumLenArr[i])
+ if (!chctx->sumLenArr[i])
continue;
- if (q->bandFlagsBuf[i] || q->bandWidthT[i]) {
+ if (chctx->bandFlagsBuf[i] || chctx->bandWidthT[i]) {
for (j = band_tab[i]; j < band_tab[i + 1]; j++) {
- cw_len = q->CWlengthT[j];
+ cw_len = chctx->CWlengthT[j];
cw = 0;
if (get_bits_count(&q->gb) + cw_len > 512) {
@@ -662,149 +695,133 @@ static int imc_get_coeffs(IMCContext *q)
return AVERROR_INVALIDDATA;
}
- if (cw_len && (!q->bandFlagsBuf[i] || !q->skipFlags[j]))
+ if (cw_len && (!chctx->bandFlagsBuf[i] || !chctx->skipFlags[j]))
cw = get_bits(&q->gb, cw_len);
- q->codewords[j] = cw;
+ chctx->codewords[j] = cw;
}
}
}
return 0;
}
-static int imc_decode_frame(AVCodecContext *avctx, void *data,
- int *got_frame_ptr, AVPacket *avpkt)
+static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch)
{
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
-
- IMCContext *q = avctx->priv_data;
-
int stream_format_code;
int imc_hdr, i, j, ret;
int flag;
int bits, summer;
int counter, bitscount;
- LOCAL_ALIGNED_16(uint16_t, buf16, [IMC_BLOCK_SIZE / 2]);
+ IMCChannel *chctx = q->chctx + ch;
- if (buf_size < IMC_BLOCK_SIZE) {
- av_log(avctx, AV_LOG_ERROR, "imc frame too small!\n");
- return AVERROR_INVALIDDATA;
- }
-
- /* get output buffer */
- q->frame.nb_samples = COEFFS;
- if ((ret = avctx->get_buffer(avctx, &q->frame)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return ret;
- }
- q->out_samples = (float*)q->frame.data[0];
-
- q->dsp.bswap16_buf(buf16, (const uint16_t*)buf, IMC_BLOCK_SIZE / 2);
-
- init_get_bits(&q->gb, (const uint8_t*)buf16, IMC_BLOCK_SIZE * 8);
/* Check the frame header */
imc_hdr = get_bits(&q->gb, 9);
- if (imc_hdr != IMC_FRAME_ID) {
- av_log(avctx, AV_LOG_ERROR, "imc frame header check failed!\n");
- av_log(avctx, AV_LOG_ERROR, "got %x instead of 0x21.\n", imc_hdr);
+ if (imc_hdr & 0x18) {
+ av_log(avctx, AV_LOG_ERROR, "frame header check failed!\n");
+ av_log(avctx, AV_LOG_ERROR, "got %X.\n", imc_hdr);
return AVERROR_INVALIDDATA;
}
stream_format_code = get_bits(&q->gb, 3);
if (stream_format_code & 1) {
- av_log(avctx, AV_LOG_ERROR, "Stream code format %X is not supported\n", stream_format_code);
- return AVERROR_INVALIDDATA;
+ av_log_ask_for_sample(avctx, "Stream format %X is not supported\n",
+ stream_format_code);
+ return AVERROR_PATCHWELCOME;
}
// av_log(avctx, AV_LOG_DEBUG, "stream_format_code = %d\n", stream_format_code);
if (stream_format_code & 0x04)
- q->decoder_reset = 1;
+ chctx->decoder_reset = 1;
- if (q->decoder_reset) {
+ if (chctx->decoder_reset) {
memset(q->out_samples, 0, sizeof(q->out_samples));
for (i = 0; i < BANDS; i++)
- q->old_floor[i] = 1.0;
+ chctx->old_floor[i] = 1.0;
for (i = 0; i < COEFFS; i++)
- q->CWdecoded[i] = 0;
- q->decoder_reset = 0;
+ chctx->CWdecoded[i] = 0;
+ chctx->decoder_reset = 0;
}
flag = get_bits1(&q->gb);
- imc_read_level_coeffs(q, stream_format_code, q->levlCoeffBuf);
+ imc_read_level_coeffs(q, stream_format_code, chctx->levlCoeffBuf);
if (stream_format_code & 0x4)
- imc_decode_level_coefficients(q, q->levlCoeffBuf,
- q->flcoeffs1, q->flcoeffs2);
+ imc_decode_level_coefficients(q, chctx->levlCoeffBuf,
+ chctx->flcoeffs1, chctx->flcoeffs2);
else
- imc_decode_level_coefficients2(q, q->levlCoeffBuf, q->old_floor,
- q->flcoeffs1, q->flcoeffs2);
+ imc_decode_level_coefficients2(q, chctx->levlCoeffBuf, chctx->old_floor,
+ chctx->flcoeffs1, chctx->flcoeffs2);
- memcpy(q->old_floor, q->flcoeffs1, 32 * sizeof(float));
+ memcpy(chctx->old_floor, chctx->flcoeffs1, 32 * sizeof(float));
counter = 0;
for (i = 0; i < BANDS; i++) {
- if (q->levlCoeffBuf[i] == 16) {
- q->bandWidthT[i] = 0;
+ if (chctx->levlCoeffBuf[i] == 16) {
+ chctx->bandWidthT[i] = 0;
counter++;
} else
- q->bandWidthT[i] = band_tab[i + 1] - band_tab[i];
+ chctx->bandWidthT[i] = band_tab[i + 1] - band_tab[i];
}
- memset(q->bandFlagsBuf, 0, BANDS * sizeof(int));
+ memset(chctx->bandFlagsBuf, 0, BANDS * sizeof(int));
for (i = 0; i < BANDS - 1; i++) {
- if (q->bandWidthT[i])
- q->bandFlagsBuf[i] = get_bits1(&q->gb);
+ if (chctx->bandWidthT[i])
+ chctx->bandFlagsBuf[i] = get_bits1(&q->gb);
}
- imc_calculate_coeffs(q, q->flcoeffs1, q->flcoeffs2, q->bandWidthT, q->flcoeffs3, q->flcoeffs5);
+ imc_calculate_coeffs(q, chctx->flcoeffs1, chctx->flcoeffs2, chctx->bandWidthT, chctx->flcoeffs3, chctx->flcoeffs5);
bitscount = 0;
/* first 4 bands will be assigned 5 bits per coefficient */
if (stream_format_code & 0x2) {
bitscount += 15;
- q->bitsBandT[0] = 5;
- q->CWlengthT[0] = 5;
- q->CWlengthT[1] = 5;
- q->CWlengthT[2] = 5;
+ chctx->bitsBandT[0] = 5;
+ chctx->CWlengthT[0] = 5;
+ chctx->CWlengthT[1] = 5;
+ chctx->CWlengthT[2] = 5;
for (i = 1; i < 4; i++) {
- bits = (q->levlCoeffBuf[i] == 16) ? 0 : 5;
- q->bitsBandT[i] = bits;
+ bits = (chctx->levlCoeffBuf[i] == 16) ? 0 : 5;
+ chctx->bitsBandT[i] = bits;
for (j = band_tab[i]; j < band_tab[i + 1]; j++) {
- q->CWlengthT[j] = bits;
+ chctx->CWlengthT[j] = bits;
bitscount += bits;
}
}
}
+ if (avctx->codec_id == CODEC_ID_IAC) {
+ bitscount += !!chctx->bandWidthT[BANDS - 1];
+ if (!(stream_format_code & 0x2))
+ bitscount += 16;
+ }
- if ((ret = bit_allocation(q, stream_format_code,
+ if ((ret = bit_allocation(q, chctx, stream_format_code,
512 - bitscount - get_bits_count(&q->gb),
flag)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Bit allocations failed\n");
- q->decoder_reset = 1;
+ chctx->decoder_reset = 1;
return ret;
}
for (i = 0; i < BANDS; i++) {
- q->sumLenArr[i] = 0;
- q->skipFlagRaw[i] = 0;
+ chctx->sumLenArr[i] = 0;
+ chctx->skipFlagRaw[i] = 0;
for (j = band_tab[i]; j < band_tab[i + 1]; j++)
- q->sumLenArr[i] += q->CWlengthT[j];
- if (q->bandFlagsBuf[i])
- if ((((band_tab[i + 1] - band_tab[i]) * 1.5) > q->sumLenArr[i]) && (q->sumLenArr[i] > 0))
- q->skipFlagRaw[i] = 1;
+ chctx->sumLenArr[i] += chctx->CWlengthT[j];
+ if (chctx->bandFlagsBuf[i])
+ if ((((band_tab[i + 1] - band_tab[i]) * 1.5) > chctx->sumLenArr[i]) && (chctx->sumLenArr[i] > 0))
+ chctx->skipFlagRaw[i] = 1;
}
- imc_get_skip_coeff(q);
+ imc_get_skip_coeff(q, chctx);
for (i = 0; i < BANDS; i++) {
- q->flcoeffs6[i] = q->flcoeffs1[i];
+ chctx->flcoeffs6[i] = chctx->flcoeffs1[i];
/* band has flag set and at least one coded coefficient */
- if (q->bandFlagsBuf[i] && (band_tab[i + 1] - band_tab[i]) != q->skipFlagCount[i]) {
- q->flcoeffs6[i] *= q->sqrt_tab[ band_tab[i + 1] - band_tab[i]] /
- q->sqrt_tab[(band_tab[i + 1] - band_tab[i] - q->skipFlagCount[i])];
+ if (chctx->bandFlagsBuf[i] && (band_tab[i + 1] - band_tab[i]) != chctx->skipFlagCount[i]) {
+ chctx->flcoeffs6[i] *= q->sqrt_tab[ band_tab[i + 1] - band_tab[i]] /
+ q->sqrt_tab[(band_tab[i + 1] - band_tab[i] - chctx->skipFlagCount[i])];
}
}
@@ -812,49 +829,100 @@ static int imc_decode_frame(AVCodecContext *avctx, void *data,
bits = summer = 0;
for (i = 0; i < BANDS; i++) {
- if (q->bandFlagsBuf[i]) {
+ if (chctx->bandFlagsBuf[i]) {
for (j = band_tab[i]; j < band_tab[i + 1]; j++) {
- if (q->skipFlags[j]) {
- summer += q->CWlengthT[j];
- q->CWlengthT[j] = 0;
+ if (chctx->skipFlags[j]) {
+ summer += chctx->CWlengthT[j];
+ chctx->CWlengthT[j] = 0;
}
}
- bits += q->skipFlagBits[i];
- summer -= q->skipFlagBits[i];
+ bits += chctx->skipFlagBits[i];
+ summer -= chctx->skipFlagBits[i];
}
}
- imc_adjust_bit_allocation(q, summer);
+ imc_adjust_bit_allocation(q, chctx, summer);
for (i = 0; i < BANDS; i++) {
- q->sumLenArr[i] = 0;
+ chctx->sumLenArr[i] = 0;
for (j = band_tab[i]; j < band_tab[i + 1]; j++)
- if (!q->skipFlags[j])
- q->sumLenArr[i] += q->CWlengthT[j];
+ if (!chctx->skipFlags[j])
+ chctx->sumLenArr[i] += chctx->CWlengthT[j];
}
- memset(q->codewords, 0, sizeof(q->codewords));
+ memset(chctx->codewords, 0, sizeof(chctx->codewords));
- if (imc_get_coeffs(q) < 0) {
+ if (imc_get_coeffs(q, chctx) < 0) {
av_log(avctx, AV_LOG_ERROR, "Read coefficients failed\n");
- q->decoder_reset = 1;
+ chctx->decoder_reset = 1;
return AVERROR_INVALIDDATA;
}
- if (inverse_quant_coeff(q, stream_format_code) < 0) {
+ if (inverse_quant_coeff(q, chctx, stream_format_code) < 0) {
av_log(avctx, AV_LOG_ERROR, "Inverse quantization of coefficients failed\n");
- q->decoder_reset = 1;
+ chctx->decoder_reset = 1;
return AVERROR_INVALIDDATA;
}
- memset(q->skipFlags, 0, sizeof(q->skipFlags));
+ memset(chctx->skipFlags, 0, sizeof(chctx->skipFlags));
+
+ imc_imdct256(q, chctx, avctx->channels);
+
+ return 0;
+}
+
+static int imc_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
+{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ int ret, i;
- imc_imdct256(q);
+ IMCContext *q = avctx->priv_data;
+
+ LOCAL_ALIGNED_16(uint16_t, buf16, [IMC_BLOCK_SIZE / 2]);
+
+ if (buf_size < IMC_BLOCK_SIZE * avctx->channels) {
+ av_log(avctx, AV_LOG_ERROR, "frame too small!\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ /* get output buffer */
+ q->frame.nb_samples = COEFFS;
+ if ((ret = avctx->get_buffer(avctx, &q->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+
+ for (i = 0; i < avctx->channels; i++) {
+ q->out_samples = (float*)q->frame.data[0] + i;
+
+ q->dsp.bswap16_buf(buf16, (const uint16_t*)buf, IMC_BLOCK_SIZE / 2);
+
+ init_get_bits(&q->gb, (const uint8_t*)buf16, IMC_BLOCK_SIZE * 8);
+
+ buf += IMC_BLOCK_SIZE;
+
+ if ((ret = imc_decode_block(avctx, q, i)) < 0)
+ return ret;
+ }
+
+ if (avctx->channels == 2) {
+ float *src = (float*)q->frame.data[0], t1, t2;
+
+ for (i = 0; i < COEFFS; i++) {
+ t1 = src[0];
+ t2 = src[1];
+ src[0] = t1 + t2;
+ src[1] = t1 - t2;
+ src += 2;
+ }
+ }
*got_frame_ptr = 1;
*(AVFrame *)data = q->frame;
- return IMC_BLOCK_SIZE;
+ return IMC_BLOCK_SIZE * avctx->channels;
}
@@ -879,3 +947,15 @@ AVCodec ff_imc_decoder = {
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"),
};
+
+AVCodec ff_iac_decoder = {
+ .name = "iac",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_IAC,
+ .priv_data_size = sizeof(IMCContext),
+ .init = imc_decode_init,
+ .close = imc_decode_close,
+ .decode = imc_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("IAC (Indeo Audio Coder)"),
+};
diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h
index 64e7c7185e..7d61a197a6 100644
--- a/libavcodec/imcdata.h
+++ b/libavcodec/imcdata.h
@@ -44,6 +44,25 @@ static const int8_t cyclTab2[32] = {
12, 13, 14, 15, 16, 17, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29};
+static const float iac_weights1[31] = {
+ 0.0538585, 0.0576251, 0.0645592, 0.0494032, 0.0428915, 0.0592188,
+ 0.0604145, 0.0673549, 0.0797351, 0.0972911, 0.119376, 0.144777,
+ 0.17181, 0.198625, 0.242918, 0.262113, 0.278434, 0.310752,
+ 0.319978, 0.328482, 0.354631, 0.380212, 0.388783, 0.400428,
+ 0.43096, 0.462397, 0.479469, 0.499329, 0.534526, 0.568631,
+ 0.589218
+};
+
+static const float iac_weights2[31] = {
+ 0.000375307, 0.000450455, 0.000612191, 0.000297262, 0.000202956,
+ 0.000484887, 0.000511777, 0.000686431, 0.00108256, 0.00185267,
+ 0.00321869, 0.00541861, 0.00860266, 0.012726, 0.0219151,
+ 0.0269104, 0.0316774, 0.0426107, 0.046113, 0.0494974,
+ 0.0608692, 0.0734633, 0.0780208, 0.0844921, 0.103034,
+ 0.124606, 0.137421, 0.153336, 0.184296, 0.217792,
+ 0.239742
+};
+
static const float imc_weights1[31] = {
0.119595, 0.123124, 0.129192, 9.97377e-2, 8.1923e-2, 9.61153e-2, 8.77885e-2, 8.61174e-2,
9.00882e-2, 9.91658e-2, 0.112991, 0.131126, 0.152886, 0.177292, 0.221782, 0.244917, 0.267386,
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index 652e824843..9dacc29766 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -275,7 +275,8 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data,
maxband = c->last_max_band + get_vlc2(gb, band_vlc.table, MPC8_BANDS_BITS, 2);
if(maxband > 32) maxband -= 33;
}
- if(maxband >= BANDS) {
+
+ if(maxband > c->maxbands + 1 || maxband >= BANDS) {
av_log(avctx, AV_LOG_ERROR, "maxband %d too large\n",maxband);
return AVERROR_INVALIDDATA;
}
@@ -412,7 +413,8 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data,
}
}
- ff_mpc_dequantize_and_synth(c, maxband, c->frame.data[0], avctx->channels);
+ ff_mpc_dequantize_and_synth(c, maxband - 1, c->frame.data[0],
+ avctx->channels);
c->cur_frame++;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index a9e1f75f30..b3644ba24c 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -27,7 +27,7 @@
*/
#define LIBAVCODEC_VERSION_MAJOR 54
-#define LIBAVCODEC_VERSION_MINOR 24
+#define LIBAVCODEC_VERSION_MINOR 25
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index fac8d0b2cd..90227dd9f9 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -123,7 +123,8 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
return 0;
}
-void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values)
+int ff_vorbis_ready_floor1_list(AVCodecContext *avccontext,
+ vorbis_floor1_entry *list, int values)
{
int i;
list[0].sort = 0;
@@ -147,6 +148,11 @@ void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values)
for (i = 0; i < values - 1; i++) {
int j;
for (j = i + 1; j < values; j++) {
+ if (list[i].x == list[j].x) {
+ av_log(avccontext, AV_LOG_ERROR,
+ "Duplicate value found in floor 1 X coordinates\n");
+ return AVERROR_INVALIDDATA;
+ }
if (list[list[i].sort].x > list[list[j].sort].x) {
int tmp = list[i].sort;
list[i].sort = list[j].sort;
@@ -154,6 +160,7 @@ void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values)
}
}
}
+ return 0;
}
static inline void render_line_unrolled(intptr_t x, int y, int x1,
diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index 59afcce766..14045ec53e 100644
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -36,7 +36,8 @@ typedef struct {
uint16_t high;
} vorbis_floor1_entry;
-void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values);
+int ff_vorbis_ready_floor1_list(AVCodecContext *avccontext,
+ vorbis_floor1_entry *list, int values);
unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n)
int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num);
void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index ddc79fcc43..6785105460 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -578,14 +578,10 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
}
// Precalculate order of x coordinates - needed for decode
- ff_vorbis_ready_floor1_list(floor_setup->data.t1.list, floor_setup->data.t1.x_list_dim);
-
- for (j=1; j<floor_setup->data.t1.x_list_dim; j++) {
- if ( floor_setup->data.t1.list[ floor_setup->data.t1.list[j-1].sort ].x
- == floor_setup->data.t1.list[ floor_setup->data.t1.list[j ].sort ].x) {
- av_log(vc->avccontext, AV_LOG_ERROR, "Non unique x values in floor type 1\n");
- return AVERROR_INVALIDDATA;
- }
+ if (ff_vorbis_ready_floor1_list(vc->avccontext,
+ floor_setup->data.t1.list,
+ floor_setup->data.t1.x_list_dim)) {
+ return AVERROR_INVALIDDATA;
}
} else if (floor_setup->floor_type == 0) {
unsigned max_codebook_dim = 0;
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index b7d816dc63..7a053c2acc 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -340,7 +340,8 @@ static int create_vorbis_context(vorbis_enc_context *venc,
};
fc->list[i].x = a[i - 2];
}
- ff_vorbis_ready_floor1_list(fc->list, fc->values);
+ if (ff_vorbis_ready_floor1_list(avccontext, fc->list, fc->values))
+ return AVERROR_BUG;
venc->nresidues = 1;
venc->residues = av_malloc(sizeof(vorbis_enc_residue) * venc->nresidues);