mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-02 09:01:46 -05:00
Some misc fixes. consts, base64 optimisation (not that it will be with us long anyway), and c comments
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2407 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
4b7b7b15d7
commit
cb8c5a925f
3 changed files with 14 additions and 14 deletions
|
|
@ -37,16 +37,16 @@
|
||||||
|
|
||||||
#include "base64.h"
|
#include "base64.h"
|
||||||
|
|
||||||
static char base64_chars[] =
|
static const char base64_chars[] =
|
||||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
|
|
||||||
static int pos(char c)
|
static int pos(char c)
|
||||||
{
|
{
|
||||||
char *p;
|
if (c >= 'A' && c <= 'Z') return c - 'A' + 0;
|
||||||
for (p = base64_chars; *p; p++)
|
if (c >= 'a' && c <= 'z') return c - 'a' + 26;
|
||||||
if (*p == c)
|
if (c >= '0' && c <= '9') return c - '0' + 52;
|
||||||
return p - base64_chars;
|
if (c == '+') return 62;
|
||||||
return -1;
|
if (c == '/') return 63;
|
||||||
}
|
}
|
||||||
|
|
||||||
int pa_base64_encode(const void *data, int size, char **str)
|
int pa_base64_encode(const void *data, int size, char **str)
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ int pa_headerlist_putsappend(pa_headerlist *p, const char *key, const char *valu
|
||||||
hdr->value = pa_xstrdup(value);
|
hdr->value = pa_xstrdup(value);
|
||||||
add = TRUE;
|
add = TRUE;
|
||||||
} else {
|
} else {
|
||||||
void *newval = (void*)pa_sprintf_malloc("%s%s", (char*)hdr->value, value);
|
void *newval = pa_sprintf_malloc("%s%s", (char*)hdr->value, value);
|
||||||
pa_xfree(hdr->value);
|
pa_xfree(hdr->value);
|
||||||
hdr->value = newval;
|
hdr->value = newval;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -461,13 +461,13 @@ int pa_raop_client_encode_sample(pa_raop_client* c, pa_memchunk* raw, pa_memchun
|
||||||
/* Now write the actual samples */
|
/* Now write the actual samples */
|
||||||
bp = b + header_size;
|
bp = b + header_size;
|
||||||
size = bpos = 0;
|
size = bpos = 0;
|
||||||
bit_writer(&bp,&bpos,&size,1,3); // channel=1, stereo
|
bit_writer(&bp,&bpos,&size,1,3); /* channel=1, stereo */
|
||||||
bit_writer(&bp,&bpos,&size,0,4); // unknown
|
bit_writer(&bp,&bpos,&size,0,4); /* unknown */
|
||||||
bit_writer(&bp,&bpos,&size,0,8); // unknown
|
bit_writer(&bp,&bpos,&size,0,8); /* unknown */
|
||||||
bit_writer(&bp,&bpos,&size,0,4); // unknown
|
bit_writer(&bp,&bpos,&size,0,4); /* unknown */
|
||||||
bit_writer(&bp,&bpos,&size,1,1); // hassize
|
bit_writer(&bp,&bpos,&size,1,1); /* hassize */
|
||||||
bit_writer(&bp,&bpos,&size,0,2); // unused
|
bit_writer(&bp,&bpos,&size,0,2); /* unused */
|
||||||
bit_writer(&bp,&bpos,&size,1,1); // is-not-compressed
|
bit_writer(&bp,&bpos,&size,1,1); /* is-not-compressed */
|
||||||
|
|
||||||
/* size of data, integer, big endian */
|
/* size of data, integer, big endian */
|
||||||
bit_writer(&bp,&bpos,&size,(bsize>>24)&0xff,8);
|
bit_writer(&bp,&bpos,&size,(bsize>>24)&0xff,8);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue