eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes multistream CBR encoding and multistream surround for >20 ms

Browse source
This commit is contained in:
Jean-Marc Valin 2013-10-14 17:47:18 -04:00
parent c6d0c43df7
commit 2e653a7b47
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/opus_multistream_encoder.c
View file

@ -238,7 +238,7 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, opus_val16 *b
upsample = resampling_factor(rate); upsample = resampling_factor(rate);
frame_size = len*upsample; frame_size = len*upsample;
for (LM=0;LM<=celt_mode->maxLM;LM++) for (LM=0;LM<celt_mode->maxLM;LM++)
if (celt_mode->shortMdctSize<<LM==frame_size) if (celt_mode->shortMdctSize<<LM==frame_size)
break; break;
@ -841,6 +841,8 @@ static int opus_multistream_encode_native
/* Reserve three bytes for the last stream and four for the others */ /* Reserve three bytes for the last stream and four for the others */
curr_max -= IMAX(0,4*(st->layout.nb_streams-s-1)-1); curr_max -= IMAX(0,4*(st->layout.nb_streams-s-1)-1);
curr_max = IMIN(curr_max,MS_FRAME_TMP); curr_max = IMIN(curr_max,MS_FRAME_TMP);
if (!vbr && s == st->layout.nb_streams-1)
opus_encoder_ctl(enc, OPUS_SET_BITRATE(curr_max*(8*Fs/frame_size)));
len = opus_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth, len = opus_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth,
pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, downmix); pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, downmix);
if (len<0) if (len<0)
@ -855,11 +857,8 @@ static int opus_multistream_encode_native
len = opus_repacketizer_out_range_impl(&rp, 0, opus_repacketizer_get_nb_frames(&rp), data, max_data_bytes-tot_size, s != st->layout.nb_streams-1); len = opus_repacketizer_out_range_impl(&rp, 0, opus_repacketizer_get_nb_frames(&rp), data, max_data_bytes-tot_size, s != st->layout.nb_streams-1);
if (!vbr && s == st->layout.nb_streams-1 && curr_max > len) if (!vbr && s == st->layout.nb_streams-1 && curr_max > len)
{ {
if (pad_frame(data, len, curr_max)) /* Can pad_frame() still fail here? */
{ if (!pad_frame(data, len, curr_max))
RESTORE_STACK;
return OPUS_INTERNAL_ERROR;
}
len = curr_max; len = curr_max;
} }
data += len; data += len;
@ -868,7 +867,6 @@ static int opus_multistream_encode_native
/*printf("\n");*/ /*printf("\n");*/
RESTORE_STACK; RESTORE_STACK;
return tot_size; return tot_size;
} }
#if !defined(DISABLE_FLOAT_API) #if !defined(DISABLE_FLOAT_API)