580b307fd7
Sync opus codec to upstream commit
02fed471a4568852d6618e041c4f2af0d7730ee2 (August 30 2013)
This brings in a lot of optimizations but also makes the diff
between our codec and the upstream much smaller as most of our
optimizations have been upstreamed or supeceded.
Speedups across the board for CELT mode files:
64kbps 128kbps
H300 9.82MHz 15.48MHz
c200 4.86MHz 9.63MHz
fuze v1 10.32MHz 15.92MHz
For the silk mode test file (16kbps) arm targets get a speedup
of about 2MHz while the H300 is 7.8MHz slower, likely because it's
now using the pseudostack more rather than the real stack which
is in iram. Patches to get around that are upcomming.
Change-Id: Ifecf963e461c51ac42e09dac1e91bc4bc3b12fa3
116 lines
4.4 KiB
C
116 lines
4.4 KiB
C
/* Copyright (c) 2012 Xiph.Org Foundation
|
|
Written by Jean-Marc Valin */
|
|
/*
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions
|
|
are met:
|
|
|
|
- Redistributions of source code must retain the above copyright
|
|
notice, this list of conditions and the following disclaimer.
|
|
|
|
- Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
|
|
#ifndef OPUS_PRIVATE_H
|
|
#define OPUS_PRIVATE_H
|
|
|
|
#include "arch.h"
|
|
#include "opus.h"
|
|
#include "celt.h"
|
|
|
|
struct OpusRepacketizer {
|
|
unsigned char toc;
|
|
int nb_frames;
|
|
const unsigned char *frames[48];
|
|
opus_int16 len[48];
|
|
int framesize;
|
|
};
|
|
|
|
typedef struct ChannelLayout {
|
|
int nb_channels;
|
|
int nb_streams;
|
|
int nb_coupled_streams;
|
|
unsigned char mapping[256];
|
|
} ChannelLayout;
|
|
|
|
int validate_layout(const ChannelLayout *layout);
|
|
int get_left_channel(const ChannelLayout *layout, int stream_id, int prev);
|
|
int get_right_channel(const ChannelLayout *layout, int stream_id, int prev);
|
|
int get_mono_channel(const ChannelLayout *layout, int stream_id, int prev);
|
|
|
|
|
|
|
|
#define MODE_SILK_ONLY 1000
|
|
#define MODE_HYBRID 1001
|
|
#define MODE_CELT_ONLY 1002
|
|
|
|
#define OPUS_SET_VOICE_RATIO_REQUEST 11018
|
|
#define OPUS_GET_VOICE_RATIO_REQUEST 11019
|
|
|
|
/** Configures the encoder's expected percentage of voice
|
|
* opposed to music or other signals.
|
|
*
|
|
* @note This interface is currently more aspiration than actuality. It's
|
|
* ultimately expected to bias an automatic signal classifier, but it currently
|
|
* just shifts the static bitrate to mode mapping around a little bit.
|
|
*
|
|
* @param[in] x <tt>int</tt>: Voice percentage in the range 0-100, inclusive.
|
|
* @hideinitializer */
|
|
#define OPUS_SET_VOICE_RATIO(x) OPUS_SET_VOICE_RATIO_REQUEST, __opus_check_int(x)
|
|
/** Gets the encoder's configured voice ratio value, @see OPUS_SET_VOICE_RATIO
|
|
*
|
|
* @param[out] x <tt>int*</tt>: Voice percentage in the range 0-100, inclusive.
|
|
* @hideinitializer */
|
|
#define OPUS_GET_VOICE_RATIO(x) OPUS_GET_VOICE_RATIO_REQUEST, __opus_check_int_ptr(x)
|
|
|
|
|
|
#define OPUS_SET_FORCE_MODE_REQUEST 11002
|
|
#define OPUS_SET_FORCE_MODE(x) OPUS_SET_FORCE_MODE_REQUEST, __opus_check_int(x)
|
|
|
|
typedef void (*downmix_func)(const void *, float *, int, int, int);
|
|
void downmix_float(const void *_x, float *sub, int subframe, int offset, int C);
|
|
void downmix_int(const void *_x, float *sub, int subframe, int offset, int C);
|
|
|
|
int optimize_framesize(const opus_val16 *x, int len, int C, opus_int32 Fs,
|
|
int bitrate, opus_val16 tonality, opus_val32 *mem, int buffering,
|
|
downmix_func downmix);
|
|
|
|
int encode_size(int size, unsigned char *data);
|
|
|
|
opus_int32 frame_size_select(opus_int32 frame_size, int variable_duration, opus_int32 Fs);
|
|
|
|
opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
|
|
unsigned char *data, opus_int32 out_data_bytes, int lsb_depth
|
|
#ifndef FIXED_POINT
|
|
, AnalysisInfo *analysis_info
|
|
#endif
|
|
);
|
|
|
|
int opus_decode_native(OpusDecoder *st, const unsigned char *data, opus_int32 len,
|
|
opus_val16 *pcm, int frame_size, int decode_fec, int self_delimited,
|
|
int *packet_offset, int soft_clip);
|
|
|
|
/* Make sure everything's aligned to sizeof(void *) bytes */
|
|
static inline int align(int i)
|
|
{
|
|
return (i+(int)sizeof(void *)-1)&-(int)sizeof(void *);
|
|
}
|
|
|
|
opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen, int self_delimited);
|
|
|
|
#endif /* OPUS_PRIVATE_H */
|