96 commits

Author	SHA1	Message	Date
Stephen Birarda	1db12453d4	move audio stats into member of Audio	2014-12-16 14:47:24 -08:00
wangyix	db0fbcab97	merge with upstream	2014-08-13 11:09:55 -07:00
wangyix	f34f0a719b	fixed lastPopOutput null ptr errors for frame loudness check	2014-08-13 10:26:01 -07:00
wangyix	e276d15ed4	repetition-with-fade implemented; testing interface crash	2014-08-11 16:25:43 -07:00
wangyix	4ec84b32b0	updated AudioRingBuffer bytes vs samples returns	2014-08-08 17:00:39 -07:00
wangyix	0dfe0b1f2a	merged with master	2014-08-08 13:32:27 -07:00
Stephen Birarda	892e30c5e1	get past assignment-client build after cmake auditing	2014-08-08 13:17:53 -07:00
wangyix	ccedb1bd20	forgot some code in checkBuffersBeforeFrameSend ... corrected updateLastPopOutputTrailingLoudness behavior to match what the old code did.	2014-07-29 10:40:01 -07:00
wangyix	a3b44a6a73	downstream silent packets seem to be working	2014-07-29 10:08:55 -07:00
wangyix	c129db16cb	formatting fix, AudioRingBuffer no longer NodeData,	2014-07-28 09:40:44 -07:00
wangyix	e17556384d	added code to clear agent audiostream frames to prevent buildup	2014-07-25 15:51:34 -07:00
wangyix	f7e043f52d	cleaned up code	2014-07-25 14:52:39 -07:00
wangyix	473cbf2afe	client audio now updated with stream class; seems fine for now	2014-07-24 17:15:46 -07:00
wangyix	c9b6879ca8	audiomixer code complete; need to test	2014-07-24 10:48:27 -07:00
Brad Hefta-Gaub	dbdce32b68	Merge pull request #3107 from wangyix/master ... prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;	2014-07-03 13:32:31 -07:00
wangyix	507518f16d	removed numFramesCapacity from being exposed everywhere	2014-07-03 11:11:56 -07:00
Andrew Meadows	8b3af0b9cb	merge upstream/master into andrew/say-no-to-warnings ... Conflicts: interface/src/ui/ApplicationOverlay.cpp libraries/audio/src/AudioRingBuffer.cpp	2014-07-02 10:37:30 -07:00
wangyix	a5943e3608	made AudioRingBuffer frames capacity variable	2014-07-01 16:24:31 -07:00
wangyix	1b0ce510f6	fixed a typo, tidied up more minor details	2014-06-30 15:33:31 -07:00
wangyix	6b6dccda2f	_resetCount to _overflowCount in AudioRingBuffer	2014-06-30 14:21:38 -07:00
wangyix	c789f3c6b9	merge with upstream	2014-06-30 14:13:34 -07:00
Aleric Inglewood	1bc2f214a5	Compiler warning fixes. ... This fixes all warnings that I got while compiling with g++ 4.7.2: In file included from interface/src/Application.h:53:0, from interface/src/Menu.cpp:36: interface/src/Menu.h: In constructor ‘Menu::Menu()’: interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder] interface/src/Menu.h:289:27: warning: ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder] interface/src/Menu.cpp:82:1: warning: when initialized here [-Wreorder] libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’: libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’: libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'. interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'. interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’: interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default] interface/src/avatar/Avatar.cpp:574:18: warning: matches this ‘link’ under ISO standard rules [enabled by default] interface/src/avatar/Avatar.cpp:577:22: warning: matches this ‘link’ under old rules [enabled by default] interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’: interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0: interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’: interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder] interface/src/ui/RunningScriptsWidget.h:60:27: warning: ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder] interface/src/ui/RunningScriptsWidget.cpp:27:1: warning: when initialized here [-Wreorder]	2014-06-27 22:18:38 +02:00
wangyix	cb48825561	added seq number to all Audio types, untested	2014-06-26 16:52:23 -07:00
wangyix	97139b0bd0	Merge branch 'master' into seqNumberStats	2014-06-26 11:47:00 -07:00
wangyix	7f23a7fbde	switched AudioRingBuffer to use _isFull flag instead	2014-06-26 11:26:10 -07:00
wangyix	ad8fe38a59	removed extra sample in AudioRingBuffer for testing	2014-06-26 09:27:06 -07:00
wangyix	37ce693153	added seqnum stats to AudioMixerClientData; added seqnums to Audio.cpp	2014-06-25 18:01:34 -07:00
wangyix	591bfa14b9	added PacketTypeAudioStreamStats for j-buffer stats ... ...instead of packing that info into audio packets.	2014-06-25 11:38:56 -07:00
wangyix	1257e0595a	moved jbufferstats class to PositionalAudioRingBuffers	2014-06-25 09:52:02 -07:00
Andrew Meadows	d3d8e4dc2d	fix warnings about signed/unsigned comparisons	2014-06-25 09:07:10 -07:00
wangyix	52f00769d4	merged with upstream	2014-06-24 17:22:30 -07:00
wangyix	e1d28dfe73	removed debug code	2014-06-24 17:14:20 -07:00
wangyix	5fd1d0a87c	added AudioRingBuffer unit test ... fixed bug with _endOfLastWrite not rolling over in addSilentFrame	2014-06-24 16:51:51 -07:00
wangyix	8e2bb130f7	added extra sample in AudioRingBuffer... ... changed buffer overflow behavior to overwrite old data in writeData; added overflow behavior to drop silent samples in addSilentFrame	2014-06-24 12:18:40 -07:00
ZappoMan	1d390faad8	add support for commandline/config value for dynamic jitter buffers	2014-06-24 10:29:38 -07:00
wangyix	53e3f5a3b0	merged with upstream	2014-06-24 09:13:05 -07:00
ZappoMan	355ab2cb95	max desired must be one less than the max frames in our ringbuffer	2014-06-23 17:58:55 -07:00
wangyix	a4f5ce2215	added stats for audiomixer jitter buffers lengths in Application	2014-06-23 17:48:57 -07:00
wangyix	e5d7d471e3	removed debug code	2014-06-23 10:55:30 -07:00
wangyix	7196814ec3	added debug prints to look at injected ring buffers	2014-06-23 10:22:16 -07:00
wangyix	cb6681f6f8	completed code for dynamicly resizing jitter buffer	2014-06-20 17:13:42 -07:00
wangyix	a5457eb86b	fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet ... added more debug stuff, other minor changes and fixes	2014-06-20 14:43:18 -07:00
wangyix	435b5094a0	moved time gap history to PositionalAudioRingBuffer, untested ... removed hard-coded jitter buffer length.	2014-06-19 17:58:38 -07:00
wangyix	77c377711a	removed debug code	2014-06-19 15:39:54 -07:00
wangyix	8176aa1292	added debug code for testing time gap history	2014-06-19 14:54:22 -07:00
wangyix	aa3602f0fb	added InterframeTimeGapHistory and frameReceived() calls	2014-06-19 14:35:02 -07:00
Oren Hurvitz	98b4d6f697	Allow the project to compile using Visual Studio 2013	2014-06-18 10:27:57 +03:00
ZappoMan	579710e4bd	some cleanup	2014-04-15 13:36:20 -07:00
ZappoMan	7a993939bf	Merge branch 'master' of https://github.com/worklist/hifi into moonshot ... Conflicts: interface/interface_en.ts interface/src/Application.cpp interface/src/Application.h interface/src/Menu.h libraries/shared/src/SharedUtil.h	2014-04-14 09:43:29 -07:00
Stephen Birarda	684c6b5372	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00