Skip to content

Commit 73c4032

Browse files
committed
refactor: ditch the multistream support
1. It is not very useful (to me right now); probably not very useful to other people too: no rust opus bindings currently support it 2. It can be mostly reconstructed in a "clean room" fashion, that is, without relying on c2rust, as it really only relies on "normal" codec
1 parent 0c59cb2 commit 73c4032

13 files changed

+13
-8186
lines changed

src/lib.rs

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,10 @@ mod silk {
161161
#[allow(unused_assignments)]
162162
mod src {
163163
pub mod analysis;
164-
pub mod mapping_matrix;
165164
pub mod mlp;
166165
pub mod opus;
167166
pub mod opus_decoder;
168167
pub mod opus_encoder;
169-
pub mod opus_multistream;
170-
pub mod opus_multistream_decoder;
171-
pub mod opus_multistream_encoder;
172-
pub mod opus_projection_decoder;
173-
pub mod opus_projection_encoder;
174168
pub mod repacketizer;
175169
// stuff for structs that do not have a clear home, named after the header files
176170
pub mod opus_defines;
@@ -204,11 +198,10 @@ pub use crate::src::opus::{
204198
};
205199
// opus_repacketizer
206200
pub use crate::src::repacketizer::{
207-
opus_multistream_packet_pad, opus_multistream_packet_unpad, opus_packet_pad, opus_packet_unpad,
208-
opus_repacketizer_cat, opus_repacketizer_create, opus_repacketizer_destroy,
209-
opus_repacketizer_get_nb_frames, opus_repacketizer_get_size, opus_repacketizer_init,
210-
opus_repacketizer_out, opus_repacketizer_out_range, opus_repacketizer_out_range_impl,
211-
OpusRepacketizer,
201+
opus_packet_pad, opus_packet_unpad, opus_repacketizer_cat, opus_repacketizer_create,
202+
opus_repacketizer_destroy, opus_repacketizer_get_nb_frames, opus_repacketizer_get_size,
203+
opus_repacketizer_init, opus_repacketizer_out, opus_repacketizer_out_range,
204+
opus_repacketizer_out_range_impl, OpusRepacketizer,
212205
};
213206

214207
// =====
@@ -248,36 +241,6 @@ pub use crate::src::opus_defines::{
248241
// opus_libinfo
249242
pub use crate::celt::celt::{opus_get_version_string, opus_strerror};
250243

251-
// =====
252-
// opus_multistream.h
253-
// =====
254-
pub use crate::src::opus_multistream_decoder::{
255-
opus_multistream_decode, opus_multistream_decode_float, opus_multistream_decoder_create,
256-
opus_multistream_decoder_ctl_impl, opus_multistream_decoder_destroy,
257-
opus_multistream_decoder_get_size, opus_multistream_decoder_init, OpusMSDecoder,
258-
};
259-
pub use crate::src::opus_multistream_encoder::{
260-
opus_multistream_encode, opus_multistream_encode_float, opus_multistream_encoder_create,
261-
opus_multistream_encoder_ctl_impl, opus_multistream_encoder_destroy,
262-
opus_multistream_encoder_get_size, opus_multistream_encoder_init,
263-
opus_multistream_surround_encoder_create, opus_multistream_surround_encoder_get_size,
264-
opus_multistream_surround_encoder_init, OpusMSEncoder,
265-
};
266-
267-
// =====
268-
// opus_projection.h
269-
// =====
270-
pub use crate::src::opus_projection_decoder::{
271-
opus_projection_decode, opus_projection_decode_float, opus_projection_decoder_create,
272-
opus_projection_decoder_ctl_impl, opus_projection_decoder_destroy,
273-
opus_projection_decoder_get_size, opus_projection_decoder_init, OpusProjectionDecoder,
274-
};
275-
pub use crate::src::opus_projection_encoder::{
276-
opus_projection_ambisonics_encoder_create, opus_projection_ambisonics_encoder_get_size,
277-
opus_projection_ambisonics_encoder_init, opus_projection_encode, opus_projection_encode_float,
278-
opus_projection_encoder_ctl_impl, opus_projection_encoder_destroy, OpusProjectionEncoder,
279-
};
280-
281244
// =====
282245
// opus_custom.h
283246
// =====

0 commit comments

Comments
 (0)