Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.xiph.org/xiph/opus.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jmvalin@jmvalin.ca>2024-01-21 22:10:27 +0300
committerJean-Marc Valin <jmvalin@jmvalin.ca>2024-01-22 22:00:29 +0300
commit3e0a7a675211e162b43d88369684daad1f545a8d (patch)
tree9a9fe2ceb6277e9197a9a2221699bef09d6919df
parentfe3a944ea19b141c45842165fe44fc05d68ba088 (diff)
Cleanup previous commitsexp_multiframe_cleanup6-tune
Rename, reindent, change arg order
-rw-r--r--src/opus_encoder.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 03da08e8..806de0e0 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -1028,8 +1028,8 @@ static int compute_redundancy_bytes(opus_int32 max_data_bytes, opus_int32 bitrat
return redundancy_bytes;
}
-static opus_int32 opus_encode_native_process(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
- unsigned char *data,
+static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
+ unsigned char *data, opus_int32 max_data_bytes,
int float_api, int first_frame,
#ifdef ENABLE_DRED
opus_int32 dred_bitrate_bps,
@@ -1037,7 +1037,7 @@ static opus_int32 opus_encode_native_process(OpusEncoder *st, const opus_val16 *
#ifndef DISABLE_FLOAT_API
AnalysisInfo *analysis_info, int is_silence,
#endif
- int redundancy, int celt_to_silk, int prefill, opus_int32 max_data_bytes,
+ int redundancy, int celt_to_silk, int prefill,
opus_int32 equiv_rate, int to_celt);
opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
@@ -1625,7 +1625,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
}
#endif
- tmp_len = opus_encode_native_process(st, pcm+i*(st->channels*enc_frame_size), enc_frame_size, curr_data, float_api, first_frame,
+ tmp_len = opus_encode_frame_native(st, pcm+i*(st->channels*enc_frame_size), enc_frame_size, curr_data, curr_max, float_api, first_frame,
#ifdef ENABLE_DRED
dred_bitrate_bps,
#endif
@@ -1633,7 +1633,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
&analysis_info,
is_silence,
#endif
- frame_redundancy, celt_to_silk, prefill, curr_max,
+ frame_redundancy, celt_to_silk, prefill,
equiv_rate, frame_to_celt
);
if (tmp_len<0)
@@ -1660,15 +1660,15 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
RESTORE_STACK;
return ret;
} else {
- ret = opus_encode_native_process(st, pcm, frame_size, data, float_api, 1,
+ ret = opus_encode_frame_native(st, pcm, frame_size, data, max_data_bytes, float_api, 1,
#ifdef ENABLE_DRED
- dred_bitrate_bps,
+ dred_bitrate_bps,
#endif
#ifndef DISABLE_FLOAT_API
- &analysis_info,
- is_silence,
+ &analysis_info,
+ is_silence,
#endif
- redundancy, celt_to_silk, prefill, max_data_bytes,
+ redundancy, celt_to_silk, prefill,
equiv_rate, to_celt
);
RESTORE_STACK;
@@ -1676,8 +1676,8 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
}
}
-static opus_int32 opus_encode_native_process(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
- unsigned char *data,
+static opus_int32 opus_encode_frame_native(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
+ unsigned char *data, opus_int32 max_data_bytes,
int float_api, int first_frame,
#ifdef ENABLE_DRED
opus_int32 dred_bitrate_bps,
@@ -1685,7 +1685,7 @@ static opus_int32 opus_encode_native_process(OpusEncoder *st, const opus_val16 *
#ifndef DISABLE_FLOAT_API
AnalysisInfo *analysis_info, int is_silence,
#endif
- int redundancy, int celt_to_silk, int prefill, opus_int32 max_data_bytes,
+ int redundancy, int celt_to_silk, int prefill,
opus_int32 equiv_rate, int to_celt)
{
void *silk_enc;