summaryrefslogtreecommitdiff
path: root/libs/libltc/ltc.c
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-09-09 16:54:26 +0200
committerRobin Gareus <robin@gareus.org>2015-09-09 16:54:26 +0200
commit48579d42b08bcd2e094d1bc159fba5a97c3fcf69 (patch)
tree5cc02b17803b4ad94e5288d44da6ad2409624d81 /libs/libltc/ltc.c
parent69822131987e0f3106055ddaa340afc8975fbe27 (diff)
update libltc to v1.1.4-4-gb034a23 (endianess issue)
Diffstat (limited to 'libs/libltc/ltc.c')
-rw-r--r--libs/libltc/ltc.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/libs/libltc/ltc.c b/libs/libltc/ltc.c
index c0dd5a7d2c..1a662f9744 100644
--- a/libs/libltc/ltc.c
+++ b/libs/libltc/ltc.c
@@ -65,24 +65,31 @@ void ltc_decoder_write(LTCDecoder *d, ltcsnd_sample_t *buf, size_t size, ltc_off
decode_ltc(d, buf, size, posinfo);
}
+#define LTC_CONVERSION_BUF_SIZE 1024
+
#define LTCWRITE_TEMPLATE(FN, FORMAT, CONV) \
void ltc_decoder_write_ ## FN (LTCDecoder *d, FORMAT *buf, size_t size, ltc_off_t posinfo) { \
- ltcsnd_sample_t tmp[1024]; \
- size_t remain = size; \
- while (remain > 0) { \
- int c = (remain > 1024) ? 1024 : remain; \
+ ltcsnd_sample_t tmp[LTC_CONVERSION_BUF_SIZE]; \
+ size_t copyStart = 0; \
+ while (copyStart < size) { \
int i; \
- for (i=0; i<c; i++) { \
+ int c = size - copyStart; \
+ c = (c > LTC_CONVERSION_BUF_SIZE) ? LTC_CONVERSION_BUF_SIZE : c; \
+ for (i=0; i < c; i++) { \
tmp[i] = CONV; \
} \
- decode_ltc(d, tmp, c, posinfo + (ltc_off_t)c); \
- remain -= c; \
+ decode_ltc(d, tmp, c, posinfo + (ltc_off_t)copyStart); \
+ copyStart += c; \
} \
}
-LTCWRITE_TEMPLATE(float, float, 128 + (buf[i] * 127.0))
-LTCWRITE_TEMPLATE(s16, short, 128 + (buf[i] >> 8))
-LTCWRITE_TEMPLATE(u16, short, (buf[i] >> 8))
+LTCWRITE_TEMPLATE(float, float, 128 + (buf[copyStart+i] * 127.0))
+/* this relies on the compiler to use an arithemtic right-shift for signed values */
+LTCWRITE_TEMPLATE(s16, short, 128 + (buf[copyStart+i] >> 8))
+/* this relies on the compiler to use a logical right-shift for unsigned values */
+LTCWRITE_TEMPLATE(u16, unsigned short, (buf[copyStart+i] >> 8))
+
+#undef LTC_CONVERSION_BUF_SIZE
int ltc_decoder_read(LTCDecoder* d, LTCFrameExt* frame) {
if (!frame) return -1;