From 24ed465e71124c392a4e75fbdbb3e7d231c42e5b Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Fri, 18 May 2012 15:14:17 -0400
Subject: [PATCH] int vs opus_int32 consistency
---
src/opus_demo.c | 2 +-
src/opus_encoder.c | 4 ++--
tests/test_opus_api.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/opus_demo.c b/src/opus_demo.c
index cc2505614..8d0449d20 100644
--- a/src/opus_demo.c
+++ b/src/opus_demo.c
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
int packet_loss_perc;
opus_int32 count=0, count_act=0;
int k;
- int skip=0;
+ opus_int32 skip=0;
int stop=0;
short *in, *out;
int application=OPUS_APPLICATION_AUDIO;
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 22462f31a..5d613c818 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -437,7 +437,7 @@ static opus_int32 user_bitrate_to_bitrate(OpusEncoder *st, int frame_size, int m
#ifdef FIXED_POINT
#define opus_encode_native opus_encode
-int opus_encode(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
+opus_int32 opus_encode(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
unsigned char *data, opus_int32 out_data_bytes)
#else
#define opus_encode_native opus_encode_float
@@ -1248,7 +1248,7 @@ opus_int32 opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_s
#ifdef FIXED_POINT
#ifndef DISABLE_FLOAT_API
-int opus_encode_float(OpusEncoder *st, const float *pcm, int frame_size,
+opus_int32 opus_encode_float(OpusEncoder *st, const float *pcm, int frame_size,
unsigned char *data, opus_int32 max_data_bytes)
{
int i, ret;
diff --git a/tests/test_opus_api.c b/tests/test_opus_api.c
index 545ef6890..f94009e71 100644
--- a/tests/test_opus_api.c
+++ b/tests/test_opus_api.c
@@ -92,7 +92,7 @@ opus_int32 test_dec_api(void)
#endif
short sbuf[960*2];
int c,err;
- int *nullvalue;
+ opus_int32 *nullvalue;
nullvalue=0;
cfgs=0;
--
GitLab