Commit 1965bf43670d8aaf2c31ad7dd200fe4562644989 - squeezelite

check for id32 tag at start of mp3, needed for localfile access case only fix typos Adrian Smith 10 years ago

4 changed file(s) with 41 addition(s) and 9 deletion(s). Raw diff Collapse all Expand all

-1

ChangeLog.txt less more

61	61	- add configurable delay for switch between pcm and dop
62	62	- allow visexport to work with jivelite running as any user
63	63	- bug fixes for dsf playback, for status progress on windows using wdm-ks output, and to avoid 100% cpu
64		- change some logging levels for slimproto to aid readablity
	64	- change some logging levels for slimproto to aid readability
65	65

+38

-6

mad.c less more

33	33	struct mad_synth synth;
34	34	enum mad_error last_error;
35	35	// for lame gapless processing
36		bool checkgapless;
	36	int checktags;
	37	u32_t consume;
37	38	u32_t skip;
38	39	u64_t samples;
39	40	u32_t padding;

96	97	return (s32_t)(sample >> (MAD_F_FRACBITS + 1 - 24)) << 8;
97	98	}
98	99
	100	// check for id3.2 tag at start of file - http://id3.org/id3v2.4.0-structure, return length
	101	static unsigned _check_id3_tag(size_t bytes) {
	102	u8_t *ptr = streambuf->readp;
	103	u32_t size = 0;
	104
	105	if (bytes > 10 && ptr == 'I' && (ptr+1) == 'D' && *(ptr+2) == '3') {
	106	// size is encoded as syncsafe integer, add 10 if footer present
	107	if ((ptr+6) < 0x80 && (ptr+7) < 0x80 && (ptr+8) < 0x80 && (ptr+9) < 0x80) {
	108	size = 10 + ((ptr+6) << 21) + ((ptr+7) << 14) + ((ptr+8) << 7) + (ptr+9) + ((*(ptr+5) & 0x10) ? 10 : 0);
	109	LOG_DEBUG("id3.2 tag len: %u", size);
	110	}
	111	}
	112
	113	return size;
	114	}
	115
99	116	// check for lame gapless params, don't advance streambuf
100	117	static void _check_lame_header(size_t bytes) {
101	118	u8_t *ptr = streambuf->readp;

149	166	LOCK_S;
150	167	bytes = min(_buf_used(streambuf), _buf_cont_read(streambuf));
151	168
152		if (m->checkgapless) {
153		m->checkgapless = false;
154		if (!stream.meta_interval) {
155		_check_lame_header(bytes);
	169	if (m->checktags) {
	170	if (m->checktags == 1) {
	171	m->consume = _check_id3_tag(bytes);
	172	m->checktags = 2;
	173	}
	174	if (m->consume) {
	175	u32_t consume = min(m->consume, bytes);
	176	LOG_DEBUG("consume: %u of %u", consume, m->consume);
	177	_buf_inc_readp(streambuf, consume);
	178	m->consume -= consume;
	179	UNLOCK_S;
	180	return DECODE_RUNNING;
	181	}
	182	if (m->checktags == 2) {
	183	if (!stream.meta_interval) {
	184	_check_lame_header(bytes);
	185	}
	186	m->checktags = 0;
156	187	}
157	188	}
158	189

304	335	if (!m->readbuf) {
305	336	m->readbuf = malloc(READBUF_SIZE + MAD_BUFFER_GUARD);
306	337	}
307		m->checkgapless = true;
	338	m->checktags = 1;
	339	m->consume = 0;
308	340	m->skip = MAD_DELAY;
309	341	m->samples = 0;
310	342	m->readbuf_len = 0;

-1

main.c less more

51	51	" -f <logfile>\t\tWrite debug to logfile\n"
52	52	" -m <mac addr>\t\tSet mac address, format: ab:cd:ef:12:34:56\n"
53	53	" -n <name>\t\tSet the player name\n"
54		" -N <filename>\t\tStore player name in filename to allow server defined name changes to be shared between servers (not suppored with -n)\n"
	54	" -N <filename>\t\tStore player name in filename to allow server defined name changes to be shared between servers (not supported with -n)\n"
55	55	#if ALSA
56	56	" -p <priority>\t\tSet real time priority of output thread (1-99)\n"
57	57	#endif

-1

squeezelite.h less more

19	19
20	20	// make may define: PORTAUDIO, SELFPIPE, RESAMPLE, VISEXPORT, DSD, LINKALL to influence build
21	21
22		#define VERSION "v1.5"
	22	#define VERSION "v1.6-dev"
23	23
24	24	// build detection
25	25	#if defined(linux)