wangyix
d03d3ef817
new auidostreamstats displayed in interface, domain page stats updated
2014-07-09 11:59:50 -07:00
wangyix
54e8ed5e11
added MovingMinMaxAvg and unit test; added additional stats to AudioStreamStats struct
2014-07-09 09:41:49 -07:00
wangyix
e732436783
added _starveCount, _silentFramesDropped
2014-07-08 14:13:42 -07:00
wangyix
2e73ac8bc1
changed Audio.cpp to not overflow _audioOutput buffer, and 2 other things
...
added _consecutiveNotMixedCount to prevent premature injector stream
deletion; made silent-frame drop only occur in dynamic jitter buffer
mode
2014-07-08 11:16:39 -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
2c6b2000b2
forgot arg in AudioRingBuffer constructor in PositionalAudioRingBUffer
...
changed _currentJitterBufferFrames to be -1 to indicate starved.
2014-07-03 11:34:16 -07:00
wangyix
507518f16d
removed numFramesCapacity from being exposed everywhere
2014-07-03 11:11:56 -07:00
Atlante45
6e02561d96
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-02 14:08:57 -07:00
Atlante45
598c1cb516
Switched Sound to NetworkAccessManager
2014-07-02 11:27:55 -07:00
Andrew Meadows
ec80ccdb9c
remove warning about signed/unsigned comparison
2014-07-02 10:49:05 -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
ab503583dd
switched order of args in PositionalAudioRingBuffer
2014-07-01 17:33:38 -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
wangyix
d2f86278b2
modified AudioStreamStats to per-stream with seq stats
...
added AudioStreamStats info to interface overlay stats
2014-06-30 12:31:58 -07:00
wangyix
de3c1ebf0f
changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream
2014-06-30 09:42:22 -07:00
wangyix
c3f571745c
removed more debug stuff
2014-06-27 17:42:22 -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
ff438a2434
added seq stats for Agent,
...
fixed AudioInjector to do << (quint16)0 instead of
skipRawData(sizeof(quint16) to correctly allocate space for seq number;
added debug prints;
2014-06-27 11:23:50 -07:00
wangyix
c5474f95bd
forgot to skip seq number in InjectedAudioRingBuffer::parseData()
2014-06-26 16:55:29 -07: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
9b8f8dbf70
removed more more unnecessary changes
2014-06-25 12:05:59 -07:00
wangyix
dd1c157f3a
reverted updateDesiredJitterBufferFrames to what Brad wrote
2014-06-25 11:42:03 -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
d098edcdf0
Merge remote-tracking branch 'upstream/master'
2014-06-24 17:39:13 -07:00
ZappoMan
bc5f563f5c
and change ring buffer size
2014-06-24 17:25:45 -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
cdbda02765
make default ring buffer much larger
2014-06-24 12:09:58 -07:00
ZappoMan
1d390faad8
add support for commandline/config value for dynamic jitter buffers
2014-06-24 10:29:38 -07:00
ZappoMan
5c188ea81e
adding more stats
2014-06-24 09:41:29 -07:00
wangyix
254946be9e
removed duplicate method from merge
2014-06-24 09:27:41 -07:00
wangyix
53e3f5a3b0
merged with upstream
2014-06-24 09:13:05 -07:00
ZappoMan
fda60cc8d5
remove resizing of jitter buffers for now, only ask for 1 frame
2014-06-23 18:45:24 -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
ZappoMan
77f262561c
typo
2014-06-23 16:47:10 -07:00
ZappoMan
8a633743b3
ignore the numSilentSamples from client, always assume one frame
2014-06-23 16:40:38 -07:00
ZappoMan
b2c982976e
break up audio mixer stats across multiple packets
2014-06-23 15:46:58 -07:00
ZappoMan
076bc11545
added server side audio mixer jitter stats
2014-06-23 15:19:13 -07:00
wangyix
fbdca59d37
fixed spacing issue
2014-06-23 11:56:14 -07:00
wangyix
ffc20b8876
changed InterframeTimeGapHistory to InterframeTimeGapStats
2014-06-23 11:22:04 -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
6b72b161d3
fixed typo with frames/samples confusion.
2014-06-20 17:52:46 -07:00
wangyix
124fba35db
fixed minor comment typo
2014-06-20 17:39:05 -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
100bc022ec
fixed a for loop that erased elements while iterating
2014-06-19 16:42:51 -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
Stephen Birarda
db1031144b
fix passing of unattenuated zones to buffers
2014-06-18 13:46:03 -07:00
Oren Hurvitz
98b4d6f697
Allow the project to compile using Visual Studio 2013
2014-06-18 10:27:57 +03:00
Andrew Meadows
3f36325642
remove warnings about signed/unsigned comparison
2014-06-17 11:59:37 -07:00
Stephen Birarda
ee71d34f02
add a crash guard around negative silent samples
2014-06-09 14:03:47 -07:00
Stephen Birarda
6fdc5df47b
bump silent audio frame version
2014-06-06 11:50:36 -07:00
Stephen Birarda
a7a9656ac7
add a mixer crash guard in addSilentFrame
2014-06-06 11:47:34 -07:00
Stephen Birarda
ae2f6a3cb6
complete piping of stereo audio through mixer
2014-06-06 10:55:04 -07:00
Stephen Birarda
7da091d2b4
initial hooks for stereo audio
2014-06-06 10:15:09 -07:00
David Rowe
bd4d167684
Make JavaScript audio samples able to be looped
...
Add a "loop" property to AudioInjectorOptions and provide an example JavaScript file.
2014-05-29 14:13:02 -07:00
Ryan Huffman
aa47043d57
Fix WAV file support
...
The previous implementation assumed the file only contained RIFF, WAVE,
fmt, and data chunks. It is valid for other chunks to appear, so I
updated it to skip any chunks until it finds the "data" chunk.
2014-05-27 11:24:48 -07:00
Stephen Birarda
304e30e9d8
Merge pull request #2818 from birarda/stop-sound
...
make sure shouldStop for injector defaults to false
2014-05-08 11:12:47 -07:00
Stephen Birarda
a8a53e35dd
make sure shouldStop for injector defaults to false
2014-05-08 11:12:16 -07:00
Philip Rosedale
6762d4d63c
Merge pull request #2816 from birarda/stop-sound
...
add interface to Audio to stop injector and see if playing
2014-05-07 20:59:58 -07:00
Stephen Birarda
f78c81e073
add interface to Audio to stop injector and see if playing
2014-05-07 17:48:01 -07:00
Philip Rosedale
c6fa903d6f
Merge pull request #2813 from birarda/stop-sound
...
return an injector from playSound and allow call to stop it
2014-05-07 16:59:00 -07:00
Stephen Birarda
99ee6ae8af
return an injector from playSound and allow user to stop it
2014-05-07 16:26:32 -07:00
Stephen Birarda
5e9036b3fe
tweak audio constants to be less agressive on cutoff
2014-05-07 15:37:41 -07:00
Atlante45
ab76e6a00c
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
...
Conflicts:
interface/src/Audio.cpp
2014-04-21 12:19:19 -07:00
Stephen Birarda
72fe9b94b1
fix property in sound
2014-04-18 14:48:26 -07:00
Stephen Birarda
c1e54d370c
change Sound property to hasDownloaded
2014-04-18 14:46:56 -07:00
Stephen Birarda
92f2794ea8
add a property to Sound to tell if empty
2014-04-18 14:26:56 -07:00
Stephen Birarda
aa5d7aa0b1
fix incorrectly named slot in Sound
2014-04-18 13:58:33 -07:00
Stephen Birarda
3b8cf8c172
fix mixed signal and slot
2014-04-18 13:55:22 -07:00
Stephen Birarda
6ef4e145c5
add better Sound error handling
2014-04-18 13:51:58 -07:00
Atlante45
d34e6ff864
Removed gettimeofday in AudioInjector
2014-04-16 12:01:41 -07:00
ZappoMan
bdf39186de
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
2014-04-15 21:04:15 -07: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
1c861fbecb
resolve conflicts on merge with upstream master
2014-04-09 15:36:15 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Stephen Birarda
2d755adfc0
repairs to good code blown away by regex
2014-04-09 10:46:20 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -07:00
ZappoMan
b56e0ff3d4
tweaks to audioring buffer
2014-04-04 07:04:48 -07:00
ZappoMan
3808cfa83d
latest work
2014-04-03 08:55:48 -07:00
ZappoMan
42efb0db65
glue in processSpatialAudio()
2014-04-02 18:18:17 -07:00
Stephen Birarda
e1cae6d295
initial handshaking for DTLS sessions between DS and clients
2014-04-02 17:29:14 -07:00
Stephen Birarda
e2b230445f
add a method to Agent for last read frame loudness
2014-03-26 10:28:59 -07:00
Andrew Meadows
c0177e80a7
use glm::isnan() everywhere for portable code
2014-03-25 09:56:15 -07:00
Stephen Birarda
af4fb26031
floats are important
2014-03-21 18:44:59 -07:00
Stephen Birarda
abd6c8a747
fix trailing average on ring buffer, remove unused constant
2014-03-21 18:28:12 -07:00
Stephen Birarda
bad209bf09
use a trailing average for a quieter loudness
2014-03-21 15:53:00 -07:00
Stephen Birarda
1580896ec4
don't use a trailing average for loudness
2014-03-21 11:42:02 -07:00
Stephen Birarda
5a6456c29f
use an epsilon value to drop average loudness to zero
2014-03-21 11:29:16 -07:00
Stephen Birarda
6f37bb54f8
suppress useless audio debug
2014-03-21 10:19:17 -07:00
Stephen Birarda
5ae63c5b0f
use a trailing average for sleep time, move loudness to RB
2014-03-20 17:10:24 -07:00
Stephen Birarda
a8ef64e0ce
calculate a cutoff loudness for mixer recovery
2014-03-20 12:52:17 -07:00
Stephen Birarda
f80a077637
fix memory overrun from silent sample writing
2014-03-18 13:33:29 -07:00
Stephen Birarda
9fbb4f1428
spacing fix and silent sample read fix
2014-03-18 13:04:28 -07:00
Stephen Birarda
e7acd0bad3
don't use QDataStream in parseData since we don't really need it
2014-03-18 12:58:29 -07:00
Stephen Birarda
7ed982a073
cleanup writing of silent frame to ring buffer
2014-03-18 11:12:36 -07:00
Stephen Birarda
61594b9a1e
fixes to silent audio frame sending
2014-03-17 16:27:49 -07:00
Stephen Birarda
9f24bd9c47
have the AudioMixer handle silent audio, send silence from Interface when gate closed
2014-03-17 15:12:02 -07:00
Stephen Birarda
1428d2d1de
take an absolute value for correct loudness
2014-03-17 14:35:04 -07:00
Stephen Birarda
bc9deb5db7
handle trivial case of not mixing silent audio streams
2014-03-17 14:29:53 -07:00
Stephen Birarda
72449fdb6a
initial optimizations to AudioMixer with mmx additions
2014-03-14 17:50:57 -07:00
Andrew Meadows
aa8c2fc8cb
use radians instead of degrees (almost) everywhere
2014-03-11 17:26:58 -07:00
Stephen Birarda
60eb588e96
remove some unecessary null pointer checks
2014-03-03 11:36:01 -08:00
ZappoMan
59eefa314c
add support for Audio.startDrumSound() to allow drum sound procedural audio in JS
2014-03-03 03:17:16 -08:00
ZappoMan
2c7d9d7a06
removed unneeded class declaration
2014-03-03 00:35:46 -08:00
ZappoMan
6ddc6132fd
removed unneeded class def
2014-03-02 21:53:36 -08:00
Philip Rosedale
70c1f8290e
assume RAW audio if not processed as WAV
2014-02-25 13:21:02 -08:00
ZappoMan
09fc58763f
Merge pull request #2054 from gaitat/19499
...
Worklist Job #19499
2014-02-24 19:10:31 -08:00
gaitat
a1e773eb2d
Worklist Job #19499
...
Kick of the build
2014-02-23 11:24:45 -05:00
gaitat
edd99f93de
Worklist Job #19499 Mac compile fix
...
third time's the charm
2014-02-21 21:48:44 -05:00
gaitat
e2b20d2475
Worklist Job #19499 Mac compile fix
2014-02-21 21:13:31 -05:00
gaitat
e331dc529d
Worklist Job #19499
...
Add WAV file support to Javascript
2014-02-21 19:26:19 -05:00
Stephen Birarda
ee9f8937e3
fix a silly typo
2014-02-19 18:03:34 -08:00
Stephen Birarda
7ceacd2751
remove blank if and fix ping reply construction
2014-02-07 10:24:01 -08:00
Stephen Birarda
b988308a8d
leverage writeDatagram helper in NodeList, ping if no active socket
2014-02-07 09:49:54 -08:00
Stephen Birarda
a823722d27
add writeDatagram helper to NodeList to insert md5 hash
2014-02-06 14:28:58 -08:00
Stephen Birarda
96fd73a766
fixed wrapped read of samples from end of buffer
2014-02-05 11:39:03 -08:00
Andrzej Kapolka
1e9e298a75
Missing includes.
2014-01-29 13:47:13 -08:00
Stephen Birarda
4de270b832
cleanup Node types, closes #1726
2014-01-28 13:38:33 -08:00
Stephen Birarda
3854f75abd
cleanup some UUID packing
2014-01-28 10:41:40 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
Stephen Birarda
8d2e9823de
remove notion of owning node from NodeData
2014-01-23 17:06:03 -08:00
Brad Hefta-Gaub
170dbe6e85
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Stephen Birarda
599e3bb9e5
resolve conflicts on merge with upstream master
2014-01-14 16:15:58 -08:00
Stephen Birarda
767a241105
Merge remote-tracking branch 'upstream/master' into nodelist-container
2014-01-14 16:08:58 -08:00
Stephen Birarda
bcf9e04f56
only output first starve for a PositionalAudioRingBuffer
2014-01-14 14:34:00 -08:00
Stephen Birarda
987c639e36
initial newline removal from all QDebug calls
2014-01-14 13:09:22 -08:00
Stephen Birarda
7d1a64ca8c
change NodeList container to QHash with QSharedPointer
2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
9e24996f39
more isnan() hacks
2014-01-12 23:11:06 -08:00
Brad Hefta-Gaub
19012e2f6d
more windows build fixes isnan
2014-01-12 22:05:55 -08:00
Brad Hefta-Gaub
f9f29c68b2
more windows build fixes
2014-01-11 01:11:49 -08:00
Brad Hefta-Gaub
9dea84c227
more windows build fixes
2014-01-11 00:45:45 -08:00
Brad Hefta-Gaub
cb828d330a
more windows build fixes
2014-01-11 00:43:47 -08:00
Brad Hefta-Gaub
148cde30a0
make it work on unix, mac, and windows
2014-01-10 22:15:41 -08:00
Brad Hefta-Gaub
46c45da842
std::min() compiler error on windows
2014-01-10 22:11:20 -08:00
Stephen Birarda
32be6199fd
fix reference to downloaded byte array samples
2014-01-05 17:41:33 -08:00
Stephen Birarda
a06f18328c
add downsampling so RAW audio for sound assumed to be 48Khz
2014-01-05 17:40:37 -08:00
Stephen Birarda
5b272bfd6a
fix random UUID creation for injected audio
2014-01-05 17:09:57 -08:00
Stephen Birarda
decaf2e245
add property for volume in AudioInjectorOptions
2014-01-03 14:17:12 -08:00
Stephen Birarda
a4f2735739
fix a glaring omission - actually move the audioInjector to QThread
2014-01-03 10:39:09 -08:00
Stephen Birarda
a61e214c9a
simplify loopback trigger for injected audio
2014-01-03 10:16:59 -08:00
Stephen Birarda
6f60a22c07
fix copyright years
2014-01-03 09:50:13 -08:00
Stephen Birarda
2a422b84f2
fix broken build by removing ASI as friend to AI
2014-01-03 09:49:32 -08:00
Stephen Birarda
339ef93fc4
remove no longer needed QDebug includes
2014-01-03 09:41:01 -08:00
Stephen Birarda
f24eff33fe
open up ASI playSound method to ScriptEngine
2014-01-03 09:38:05 -08:00
Stephen Birarda
443c94a88f
repairs to AudioMixer and audio injection flow
2014-01-02 17:15:46 -08:00
Stephen Birarda
594bd58774
add AudioScriptingInterface to expose playSound to JS
2014-01-02 15:35:28 -08:00
Stephen Birarda
845176bbc6
expose Sound to ScriptEngine
2014-01-02 15:14:28 -08:00
Stephen Birarda
8cc4a33ad3
repair AudioInjector threading
2014-01-02 13:35:56 -08:00
Stephen Birarda
3a45fb8533
cleanup new API for sound injection
2014-01-02 12:31:01 -08:00
Stephen Birarda
674c19a570
leverage new AudioInjector API for throw and catch sounds
2014-01-02 12:17:18 -08:00
Stephen Birarda
3123b83d0b
audio API changes to allow multiple injections of single sound
2014-01-02 11:53:33 -08:00
Stephen Birarda
87e5579e52
reinstate delete for starved but started audio ring buffers
2013-12-19 15:51:14 -08:00
Stephen Birarda
0446aeb4d3
loopback injected sound effects to the node by default
2013-12-19 15:44:47 -08:00
Stephen Birarda
80a2bd0844
move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector
2013-12-19 15:44:04 -08:00
Stephen Birarda
8681e66ed3
default to max volume, add a bool flag for loopback
2013-12-19 15:30:33 -08:00
Stephen Birarda
534010347b
add a volume setter to the AudioInjector
2013-12-19 15:28:10 -08:00
Stephen Birarda
7ed609633a
complete the test injector stub
2013-12-19 15:23:31 -08:00
Stephen Birarda
bdf8c4b9b2
implement threaded send for AudioInjector
2013-12-19 15:17:03 -08:00
Stephen Birarda
2409b5f784
complete inital test of AudioInjector API
2013-12-19 13:46:37 -08:00
Stephen Birarda
b035f74f94
fix for build busters with changed AbstractAudioInterface
2013-12-19 12:39:57 -08:00
Stephen Birarda
eac3b6be65
add AudioInjector class to pull samples from URL and inject
2013-12-19 12:28:37 -08:00
Stephen Birarda
589dde5139
more stubbing of AudioInjectionManager
2013-12-17 16:07:18 -08:00
Stephen Birarda
db8661f152
add a stubbed AudioInjectionManager
2013-12-17 14:13:23 -08:00
Stephen Birarda
ff0d31857a
correct sample delay pulls with negative index
2013-12-17 11:47:50 -08:00
Philip Rosedale
03869e81fd
Merge pull request #1380 from birarda/qt-for-portaudio
...
move from 44.1 to 48 on audio
2013-12-16 17:58:41 -08:00
Stephen Birarda
bb93c64d8d
some initial audio stat render fixes
2013-12-16 16:21:50 -08:00
Stephen Birarda
6b644eb130
repair upsampling and local loopback by correcting for limits
2013-12-16 15:15:25 -08:00
Stephen Birarda
1f9ca00317
drive input from buffer callback and output from network
2013-12-16 11:58:23 -08:00
ZappoMan
5830f1134e
add particle collisions with voxels
2013-12-12 17:52:22 -08:00
Stephen Birarda
f17ee1af7a
cleanup AudioRingBuffer API
2013-12-12 13:37:18 -08:00
Stephen Birarda
b06af3cd6c
copy all passed samples to AudioRingBuffer
2013-12-12 10:15:43 -08:00
Stephen Birarda
af2fa15f55
initial work for change to 48KHz
2013-12-11 12:02:08 -08:00
Stephen Birarda
7df6210ba0
Merge remote-tracking branch 'upstream/master' into qt-for-portaudio
2013-12-04 14:20:44 -08:00
Stephen Birarda
e339155328
replace missing PortAudio with Qt audio
2013-12-04 12:54:33 -08:00
Stephen Birarda
141394a664
replace UDPSocket with QUDPSocket
2013-12-02 13:34:29 -08:00
Stephen Birarda
00446076b5
remove audio injectors that are starved and not added
2013-10-21 16:04:13 -07:00
Stephen Birarda
fbb097accb
remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer
2013-10-21 15:03:07 -07:00
Stephen Birarda
b3909da5f0
audio injector requires two UUIDs
2013-10-18 17:37:25 -07:00
Stephen Birarda
4fe2e25bf0
add a stream identifier back to the audio injector
2013-10-18 17:36:59 -07:00
Stephen Birarda
7da1f5a235
add AudioMixerClientData to hold vector of PositionalAudioRingBuffer
2013-10-18 17:32:53 -07:00
Stephen Birarda
7d48c9b3bd
don't attempt to inject if audio mixer has no active socket
2013-10-17 16:49:05 -07:00
Stephen Birarda
74e66dfd35
push various PACKET_TYPES, repairs to Agent for UUID setup
2013-10-17 13:35:53 -07:00
Stephen Birarda
1c70e09178
repairs to audio exchange for new UUID setup
2013-10-17 11:58:52 -07:00
Stephen Birarda
fa146e302d
remove 16-bit node IDs and replace with UUIDs
2013-10-17 11:49:41 -07:00
Stephen Birarda
ef655f5e78
clear agent audio injector after send, don't send if empty
2013-10-16 11:50:19 -07:00
Stephen Birarda
0eae0f129c
allow audio injection from javascript
2013-10-11 17:37:48 -07:00
Stephen Birarda
0477ad79dd
add methods to set/get samples and volume
2013-10-03 13:22:02 -07:00
Stephen Birarda
e977d28fe3
replace QVariantMap glm::vec3 setters with conversions for QScriptValue
2013-10-03 11:55:30 -07:00
Stephen Birarda
a07b673f69
beginning of hook of AudioInjector into JS
2013-10-03 11:41:45 -07:00
Stephen Birarda
17fda717fe
move audio and avatar classes into assignment-client target
2013-09-17 11:04:46 -07:00
Stephen Birarda
5ac694224e
remove extra space at the top of AudioMixer
2013-09-13 11:24:56 -07:00
Stephen Birarda
d089991237
add handling of Agent assignments to Assignment, DS, AC
2013-09-13 11:14:00 -07:00
Stephen Birarda
b0c9dfeddc
more leveraging of standardized logging
2013-09-09 14:47:15 -07:00
Stephen Birarda
8077963bb1
add standardized logging and leverage forked assignment clients
2013-09-09 14:21:33 -07:00
Stephen Birarda
9eef894e24
add doxygen documentation for Assignment classes
2013-09-06 14:35:59 -07:00
Stephen Birarda
f7b0158cfe
use deque of pointers, make sure DS silent count is refreshed
2013-09-06 10:26:29 -07:00
Stephen Birarda
9244ec1c25
have client keep track of number of silent DS checkins
2013-09-06 09:41:27 -07:00
Stephen Birarda
232f79489d
decouple AM logic from main.cpp to be assignable
2013-08-22 13:12:53 -07:00
Stephen Birarda
1f8031770b
fix quoted includes in AudioInjector.cpp
2013-08-05 10:28:12 -07:00
Stephen Birarda
553c8088dd
fix include from AudioInjector.h
2013-08-05 10:27:06 -07:00
Stephen Birarda
8f876b91ae
changes for stub pull request of assignee work
2013-08-05 10:06:50 -07:00
Stephen Birarda
9834c10610
movement to use AudioInjector classes in Operative code
2013-07-11 17:47:35 -07:00
Stephen Birarda
d6601ad333
resolve conflicts on merge with upstream master
2013-07-11 14:33:50 -07:00
Stephen Birarda
38a33e0283
couple more type squishes
2013-07-11 11:11:39 -07:00
Stephen Birarda
fcb8865d2e
resolve conflicts on merge with upstream master
2013-07-11 10:58:45 -07:00
Stephen Birarda
ca8f25955a
switch usec timestamps to uint64_t
2013-07-10 11:46:48 -07:00
Stephen Birarda
68357ab6f7
include correct quaternion header for AudioInjector and Operative
2013-07-09 11:57:54 -07:00
Stephen Birarda
3cee9b1ab5
remove redundant UDPSocket include
2013-07-08 17:59:27 -07:00
Stephen Birarda
7fa3052308
remove double glm includes
2013-07-08 17:48:46 -07:00
Stephen Birarda
81e6bccd08
use packet version helpers in parseData methods
2013-07-08 14:13:36 -07:00
Stephen Birarda
8f7a3f3567
use packet version helpers for PACKET_TYPE_INJECT_AUDIO
2013-07-08 14:07:34 -07:00
Stephen Birarda
5062ae8965
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
2013-07-08 11:37:39 -07:00
Stephen Birarda
36c6912de8
your agents are now nodes
2013-07-03 10:35:09 -07:00
tosh
f1e5a56347
adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars
2013-06-30 17:08:01 +02:00
Stephen Birarda
cece4de90e
fix the default orientation for an injector
2013-06-27 11:14:22 -07:00
Philip Rosedale
13b729d9b4
Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar.
2013-06-20 18:49:05 -07:00
Philip Rosedale
2c8c34f9bd
set jitter buffer on application start to 1/2 of a packet
2013-06-20 09:08:37 -07:00
Andrzej Kapolka
db729a04aa
Converted double timestamps to long long (64 bit integers), fixed bug with
...
updating agent timestamps.
2013-06-13 11:11:59 -07:00
Stephen Birarda
beb415a851
correct buffer byte constants in AudioRingBuffer
2013-06-05 12:45:07 -07:00
Stephen Birarda
d64b46a6b2
add specialized parsing of audio data to ARB subclasses
2013-06-05 12:11:56 -07:00
Stephen Birarda
4cb00ad54b
clean up AudioRingBuffer by subclassing
2013-06-05 11:51:21 -07:00
Stephen Birarda
eee7d6f92f
resolve some conflicts on merge with upstream master
2013-06-05 09:56:26 -07:00
Stephen Birarda
6c2dcb86c8
Merge remote-tracking branch 'upstream/master' into synthesis
2013-06-05 09:55:16 -07:00
Stephen Birarda
bfad6c8f61
fix orientation setter in AudioInjector header
2013-06-04 16:10:20 -07:00
Stephen Birarda
7d3d8f8b43
rewrite the AudioInjector to send an orientation quaternion instead of bearing
2013-06-04 15:31:11 -07:00
Stephen Birarda
cd79339670
rework audio-mixer to use orientations sent by clients
2013-06-04 15:18:05 -07:00
Stephen Birarda
d02fb65a13
Merge remote-tracking branch 'upstream/master' into cube-injector
2013-06-04 11:25:39 -07:00
Stephen Birarda
3f7fbb5c1e
change injector from cube to sphere
2013-06-04 10:57:53 -07:00
Stephen Birarda
c55b6a20d7
parse the desired cube side length for injected audio source
2013-06-03 15:38:12 -07:00
Stephen Birarda
ca39593f05
move typedef for FreeVerbAgentMap to AudioRingBuffer header
2013-06-03 12:02:41 -07:00
Stephen Birarda
2d7c397138
create a FreeVerb object for each other agent per agent
2013-05-31 15:47:57 -07:00
ZappoMan
b0397e8eb9
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-30 21:41:55 -07:00
Stephen Birarda
c259b025db
fix a crash in audio injector when there is no audio mixer
2013-05-29 15:05:39 -07:00
Stephen Birarda
56e0e3882d
kill agents who send NaN bearings
2013-05-29 11:29:38 -07:00
Stephen Birarda
1fb61faded
fix the isnan check for agent bearing
2013-05-29 11:22:25 -07:00
Stephen Birarda
f45062a097
don't use audio when the bearing sent by the agent is garbage
2013-05-29 11:14:50 -07:00
Stephen Birarda
78df9fb2ed
last pieces of debugging for mixer crash
2013-05-29 11:04:46 -07:00
ZappoMan
eb675c8dd7
fix crash when no audio mixer available
2013-05-29 08:25:30 -07:00
Stephen Birarda
c661796b81
don't copy audio data if the agent sent the wrong amount
2013-05-24 15:37:48 -07:00
Stephen Birarda
36892da488
keep a pointer to owning agent in AgentData
2013-05-24 12:17:34 -07:00
Stephen Birarda
842ef820ab
use a more consistent method to clock the injector thread
2013-05-23 13:56:16 -07:00
Stephen Birarda
21cdf4ada5
remove setter for isInjectingAudio - shouldn't be set externally
2013-05-22 17:23:46 -07:00
Stephen Birarda
dae7bf8674
use AgentList defaults when AIM has no socket or address set
2013-05-20 11:48:50 -07:00
Stephen Birarda
00998ba75e
some fixes for new audio injector setup
2013-05-17 15:42:37 -07:00
Stephen Birarda
d72b931ebe
attach stream identifier to AudioRingBuffer to match incoming data in audio mixer
2013-05-17 14:57:10 -07:00
Stephen Birarda
b7b39c2a6e
have addOrUpdateAgent return a pointer to the agent instead of a bool
2013-05-17 14:03:15 -07:00
Stephen Birarda
fcfe5c9e25
disallow copying for AudioRingBuffer objects
2013-05-17 12:27:05 -07:00
Stephen Birarda
442d658835
switch from 255 to 0xFF for max volume constant
2013-05-16 14:10:48 -07:00
Stephen Birarda
a37b451993
add constants for volume byte values
2013-05-16 14:09:50 -07:00
Stephen Birarda
f6cc40362c
hook the injector up to the change AudioInjector setup
2013-05-16 13:10:48 -07:00
Stephen Birarda
a2f8d8ae25
break audio out of shared into its own library
2013-05-16 13:00:40 -07:00
