57 lines
2.8 KiB
Diff
57 lines
2.8 KiB
Diff
diff --git a/qoa.h b/qoa.h
|
|
index 592082933a..c890b88bd6 100644
|
|
--- a/qoa.h
|
|
+++ b/qoa.h
|
|
@@ -140,14 +140,14 @@ typedef struct {
|
|
#endif
|
|
} qoa_desc;
|
|
|
|
-unsigned int qoa_encode_header(qoa_desc *qoa, unsigned char *bytes);
|
|
-unsigned int qoa_encode_frame(const short *sample_data, qoa_desc *qoa, unsigned int frame_len, unsigned char *bytes);
|
|
-void *qoa_encode(const short *sample_data, qoa_desc *qoa, unsigned int *out_len);
|
|
+inline unsigned int qoa_encode_header(qoa_desc *qoa, unsigned char *bytes);
|
|
+inline unsigned int qoa_encode_frame(const short *sample_data, qoa_desc *qoa, unsigned int frame_len, unsigned char *bytes);
|
|
+inline void *qoa_encode(const short *sample_data, qoa_desc *qoa, unsigned int *out_len);
|
|
|
|
-unsigned int qoa_max_frame_size(qoa_desc *qoa);
|
|
-unsigned int qoa_decode_header(const unsigned char *bytes, int size, qoa_desc *qoa);
|
|
-unsigned int qoa_decode_frame(const unsigned char *bytes, unsigned int size, qoa_desc *qoa, short *sample_data, unsigned int *frame_len);
|
|
-short *qoa_decode(const unsigned char *bytes, int size, qoa_desc *file);
|
|
+inline unsigned int qoa_max_frame_size(qoa_desc *qoa);
|
|
+inline unsigned int qoa_decode_header(const unsigned char *bytes, int size, qoa_desc *qoa);
|
|
+inline unsigned int qoa_decode_frame(const unsigned char *bytes, unsigned int size, qoa_desc *qoa, short *sample_data, unsigned int *frame_len);
|
|
+inline short *qoa_decode(const unsigned char *bytes, int size, qoa_desc *file);
|
|
|
|
#ifndef QOA_NO_STDIO
|
|
|
|
@@ -394,9 +394,9 @@ unsigned int qoa_encode_frame(const short *sample_data, qoa_desc *qoa, unsigned
|
|
#ifdef QOA_RECORD_TOTAL_ERROR
|
|
qoa_uint64_t best_error = -1;
|
|
#endif
|
|
- qoa_uint64_t best_slice;
|
|
- qoa_lms_t best_lms;
|
|
- int best_scalefactor;
|
|
+ qoa_uint64_t best_slice = -1;
|
|
+ qoa_lms_t best_lms = {{-1, -1, -1, -1}, {-1, -1, -1, -1}};
|
|
+ int best_scalefactor = -1;
|
|
|
|
for (int sfi = 0; sfi < 16; sfi++) {
|
|
/* There is a strong correlation between the scalefactors of
|
|
@@ -500,7 +500,7 @@ void *qoa_encode(const short *sample_data, qoa_desc *qoa, unsigned int *out_len)
|
|
num_frames * QOA_LMS_LEN * 4 * qoa->channels + /* 4 * 4 bytes lms state per channel */
|
|
num_slices * 8 * qoa->channels; /* 8 byte slices */
|
|
|
|
- unsigned char *bytes = QOA_MALLOC(encoded_size);
|
|
+ unsigned char *bytes = (unsigned char *)QOA_MALLOC(encoded_size);
|
|
|
|
for (unsigned int c = 0; c < qoa->channels; c++) {
|
|
/* Set the initial LMS weights to {0, 0, -1, 2}. This helps with the
|
|
@@ -655,7 +655,7 @@ short *qoa_decode(const unsigned char *bytes, int size, qoa_desc *qoa) {
|
|
|
|
/* Calculate the required size of the sample buffer and allocate */
|
|
int total_samples = qoa->samples * qoa->channels;
|
|
- short *sample_data = QOA_MALLOC(total_samples * sizeof(short));
|
|
+ short *sample_data = (short *)QOA_MALLOC(total_samples * sizeof(short));
|
|
|
|
unsigned int sample_index = 0;
|
|
unsigned int frame_len;
|