eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-07 07:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Multistream encoder: allocate an extra byte per stream for 100 ms

Browse source 
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
This commit is contained in:
Felicia Lim 2016-10-28 11:11:18 -07:00 • committed by Jean-Marc Valin
parent e564cc509d
commit bcfe0f68e3
No known key found for this signature in database
GPG key ID: 5E5DD9A36F9189C8
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/opus_multistream_encoder.c
View file

@ -915,6 +915,9 @@ static int opus_multistream_encode_native
/* Smallest packet the encoder can produce. */ /* Smallest packet the encoder can produce. */
smallest_packet = st->layout.nb_streams*2-1; smallest_packet = st->layout.nb_streams*2-1;
/* 100 ms needs an extra byte per stream for the ToC. */
if (Fs/frame_size == 10)
smallest_packet += st->layout.nb_streams;
if (max_data_bytes < smallest_packet) if (max_data_bytes < smallest_packet)
{ {
RESTORE_STACK; RESTORE_STACK;
@ -1036,6 +1039,9 @@ static int opus_multistream_encode_native
curr_max = max_data_bytes - tot_size; curr_max = max_data_bytes - tot_size;
/* Reserve one byte for the last stream and two for the others */ /* Reserve one byte for the last stream and two for the others */
curr_max -= IMAX(0,2*(st->layout.nb_streams-s-1)-1); curr_max -= IMAX(0,2*(st->layout.nb_streams-s-1)-1);
/* For 100 ms, reserve an extra byte per stream for the Toc */
if (Fs/frame_size == 10)
curr_max -= st->layout.nb_streams-s;
curr_max = IMIN(curr_max,MS_FRAME_TMP); curr_max = IMIN(curr_max,MS_FRAME_TMP);
/* Repacketizer will add one or two bytes for self-delimited frames */ /* Repacketizer will add one or two bytes for self-delimited frames */
if (s != st->layout.nb_streams-1) curr_max -= curr_max>253 ? 2 : 1; if (s != st->layout.nb_streams-1) curr_max -= curr_max>253 ? 2 : 1;