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

Fixes the code for optional self-delimited packing to make it fit the draft

Browse source 
This has no impact on opus_demo, test vectors, or "normal" codec operation
This commit is contained in:
Gregory Maxwell 2011-11-28 23:19:08 -05:00 • committed by Jean-Marc Valin
parent 1c80f64960
commit 92c896e880
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/opus_multistream.c
View file

@ -108,7 +108,7 @@ static int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev
i = (prev<0) ? 0 : prev+1; i = (prev<0) ? 0 : prev+1;
for (;i<layout->nb_channels;i++) for (;i<layout->nb_channels;i++)
{ {
if (layout->mapping[i]==2*layout->nb_coupled_streams+stream_id) if (layout->mapping[i]==stream_id+layout->nb_coupled_streams)
return i; return i;
} }
return -1; return -1;

3
src/repacketizer.c
View file

@ -111,7 +111,7 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
len = rp->len+begin; len = rp->len+begin;
frames = rp->frames+begin; frames = rp->frames+begin;
if (self_delimited) if (self_delimited)
tot_size = 1 + len[count-1]>=252; tot_size = 1 + (len[count-1]>=252);
else else
tot_size = 0; tot_size = 0;
@ -184,7 +184,6 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int
} }
if (self_delimited) { if (self_delimited) {
int sdlen = encode_size(len[count-1], data); int sdlen = encode_size(len[count-1], data);
tot_size += sdlen;
data += sdlen; data += sdlen;
} }
/* Copy the actual data */ /* Copy the actual data */