summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2012-11-22 05:05:35 +0100
committerMichael Giacomelli <giac2000@hotmail.com>2012-11-22 05:18:00 +0100
commitd594b361330e6570b36ebd70c1a5aedfb0c76160 (patch)
tree750f1ee831b91c04384b9603c431f7c1cce86ae5
parent3a39f77ed60df55abf1cf069a903d4665fb17cbc (diff)
downloadrockbox-d594b361330e6570b36ebd70c1a5aedfb0c76160.tar.gz
rockbox-d594b361330e6570b36ebd70c1a5aedfb0c76160.zip
Add support for 16 bit 'half float' format PCM.
I'm not 100% sure that the rounding of denormals is correct. As compared to foobar2000, some samples are off by +1 LSB. However, since I can't output 24 bit PCM easily with rockbox, I'm not sure if this is due to a bug or just how rockbox rounds. In practice I don't think it matters so I'm just going to commit this for now. Change-Id: Ic0792fcb172e4369a5512d202121c2b918b36079
-rw-r--r--lib/rbcodec/codecs/libpcm/ieee_float.c29
1 files changed, 28 insertions, 1 deletions
diff --git a/lib/rbcodec/codecs/libpcm/ieee_float.c b/lib/rbcodec/codecs/libpcm/ieee_float.c
index 639390bcd5..97a7fcecd4 100644
--- a/lib/rbcodec/codecs/libpcm/ieee_float.c
+++ b/lib/rbcodec/codecs/libpcm/ieee_float.c
@@ -38,7 +38,7 @@ static bool set_format(struct pcm_format *format)
38 return false; 38 return false;
39 } 39 }
40 40
41 if (fmt->bitspersample != 32 && fmt->bitspersample != 64) 41 if (fmt->bitspersample != 16 && fmt->bitspersample != 32 && fmt->bitspersample != 64)
42 { 42 {
43 DEBUGF("CODEC_ERROR: ieee float must be 32 or 64 bitspersample: %d\n", 43 DEBUGF("CODEC_ERROR: ieee float must be 32 or 64 bitspersample: %d\n",
44 fmt->bitspersample); 44 fmt->bitspersample);
@@ -114,6 +114,33 @@ static int decode(const uint8_t *inbuf, size_t inbufsize,
114 } 114 }
115 *outbufsize = inbufsize >> 2; 115 *outbufsize = inbufsize >> 2;
116 } 116 }
117 else if (fmt->bitspersample == 16)
118 {
119 for (i = 0; i < inbufsize; i += 2)
120 {
121 pcm = inbuf[0]|((inbuf[1]&0x03)<<8);
122 exp = ((inbuf[1]&0x7c)>>2)-15;
123 sgn = (inbuf[1] & 0x80)>>7;
124
125 if(exp == -15)
126 pcm =0;
127 else
128 {
129 pcm+=1<<10;
130 exp+=2; /*shift by 2 for rockbox fixed format*/
131 if(exp>=0)
132 pcm <<= (exp);
133 else
134 pcm >>= (-exp);
135
136 if (sgn)
137 pcm = -pcm;
138 }
139 outbuf[i/2] = pcm;
140 inbuf += 2;
141 }
142 *outbufsize = inbufsize >> 1;
143 }
117 else 144 else
118 { 145 {
119 for (i = 0; i < inbufsize; i += 8) 146 for (i = 0; i < inbufsize; i += 8)