November 2006 - Sofaswitch-svn - FreeSWITCH Mailing Lists

[commit] r177 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Sun Nov 12 22:47:16 2006 New Revision: 177 Added: sofaswitch/trunk/callflow/tests/recordmessage.src Log: Add file to record a message from the AM machine, and play it back as required. Illustrates the "robustness" of the AM code in that file play/write commands can be done anytime. Added: sofaswitch/trunk/callflow/tests/recordmessage.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/recordmessage.src Sun Nov 12 22:47:16 2006 @@ -0,0 +1,3 @@ +9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20670423 extra <special>Tool Tip<ms>Death<ms><special> <Shape>11191109 extra <special>Tool Tip<ms>Request Node from sound module<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>2307394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2507362 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>5605324 extra <special>Tool Tip<ms>End the recording..<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>10282279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>9214304214,304,262,356<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9266329308,329,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>17695537 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>" "<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>2274529 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>amREQ<ms><special>Python variable to hold event data<ms>self.amNode<ms><special> <Shape>2604618 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>16275484 extra <special>Tool Tip<ms>Play the instructions<ms><special>Filename to read audio from (Python code)<ms>"../prompts/record.c"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>9555290555,290,600,293<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9300346601,346,581,447,300,483<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>15605522 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>7605474 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.amNode<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.amNode != None) and (self.soundNode != None)<ms><special> <Shape>9265199265,513,265,635,427,639,429,199,533,202,533,262<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10190254 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new am node on ", self.amNode<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>14251461 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>14667376 extra <special>Tool Tip<ms>Catch the timer which, when fired, +indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>9656401656,401,666,535,721,536,721,534<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>12605571 extra <special>Tool Tip<ms>Initiate a timer, which causes this to +end.<ms><special>Timer period (seconds)<ms>0.1<ms><special>Timer label (string literal)<ms>hanguptime<ms><special> <Shape>5576297 extra <special>Tool Tip<ms>Repeat instructions<ms><special>Test (Python code)<ms>self.dtmfData=="3"<ms><special> <Shape>16694585 extra <special>Tool Tip<ms>Read From File<ms><special>Filename to read audio from (Python code)<ms>"record.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>5507264 extra <special>Tool Tip<ms>Start recording now<ms><special>Test (Python code)<ms>self.dtmfData=="1"<ms><special> <Shape>2694626 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>1119167 extra <special>Tool Tip<ms>Request Node from AM module<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestam<ms><special>Additional information (Python code)<ms><ms><special> <Shape>9291382291,386,334,382,332,395<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9630374630,374,631,473<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request sound<ms><special> <Shape>17508310 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"message.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>13190210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>request voip<ms><special> <Shape>5628347 extra <special>Tool Tip<ms>hear the recording<ms><special>Test (Python code)<ms>self.dtmfData="2"<ms><special> <Shape>

1 0

[commit] r176 - sofaswitch/trunk/prompts
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Sun Nov 12 22:40:50 2006 New Revision: 176 Modified: sofaswitch/trunk/prompts/record.wav Log: Change the file again... Modified: sofaswitch/trunk/prompts/record.wav ============================================================================== Binary files. No diff available.

1 0

[commit] r175 - sofaswitch/trunk/prompts
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Sun Nov 12 22:22:21 2006 New Revision: 175 Modified: sofaswitch/trunk/prompts/record.wav Log: Alter the message. Modified: sofaswitch/trunk/prompts/record.wav ============================================================================== Binary files. No diff available.

1 0

[commit] r174 - sofaswitch/trunk/prompts
by SofaSWITCH SVN 13 Nov '06

13 Nov '06

Author: derek Date: Sun Nov 12 22:19:36 2006 New Revision: 174 Added: sofaswitch/trunk/prompts/record.wav (contents, props changed) Log: Add this file. Added: sofaswitch/trunk/prompts/record.wav ============================================================================== Binary file. No diff available.

1 0

[commit] r173 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 12 Nov '06

12 Nov '06

Author: derek Date: Sun Nov 12 16:40:53 2006 New Revision: 173 Modified: sofaswitch/trunk/callflow/docs/description.dxy Log: Add descriptive overview documentation. Modified: sofaswitch/trunk/callflow/docs/description.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/description.dxy (original) +++ sofaswitch/trunk/callflow/docs/description.dxy Sun Nov 12 16:40:53 2006 @@ -2,11 +2,41 @@ \section secIntro Introduction -We describe the operation of this utilitiy with a series of examples and -associated description. The first part of this document describes the -generation of the graph with the gui, and the second part describes the -running of the graph. +The language chosen to control the SofaSwitch utilties is Python. It is +reasonably tidy language, cross platform, straightforward syntax and does not +have the dependency hell of perl. Sadly nothing is easy, and it takes +considerable effort to write Python scripts to control SofaSwitch utilities. A +graphical approach is preferable. +In this chapter of this manual, we describe CallFlow, how it works, what it +does, and how to get the most result for the minimum of effort. We note that +the user will be exposed to some Python. It is straightforward, and there are +plenty of examples to show you how to write the Python. + +\section secOverview Overview of CallFlow operation +Various items are selected from the tool bar, and placed on the screen. These +are connected together. Once the flow diagram is completed, it is compiled. +Two files are generated. +\li a graph file, which describes the items + on the screen, their internal settings ,and how they are connected. +\li a python file, which contains python documentation and python code to run + any graph file, and one line which invokes the reading of the generated + graph file. + +Prior to execution of the python file, it is expected the server and relevant +SofaSwitch applications are running Separately, in a console, the user will +invoke Python on the python file, and the desired actions happen. + +Each python file invokes the handling of variables for all items on the screen +within one "Controller" class. Should a separate graph be required to +simultaneously, it will be run within a second instance of the "Controller" +class. Thus, all graphs are kept totally separate. Should the user wish to +communicate between different executing graphs, thread safe structures such as +databases should be used. + +\section secPython Python internals +One difficulty + \section secHelloWorld Hello World example Perhaps the simplest example of a graph you can create is the standard "Hello World" example, shown here. @@ -85,10 +115,16 @@ select a region on the screen (left down, move to the opposite corner, left up), shift button down, and drag. +When selecting an item on the screen - it will be drawn with a large red cross +on it. - - - +All items on the screen have associated settings. One such setting is the tool +tip displayed when the mouse is idle above an icon for 2 seconds. Items such +as the for loop structure have additional settings - the start&increment +operations, and the termination condition. You may adjust these settings by +right mouse clicking on an item and adjusting the displayed setting. Some find +it helpful to display in the tooltip of the forloop information about the +number of loops that should be executed.

1 0

[commit] r172 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 12 Nov '06

12 Nov '06

Author: derek Date: Sun Nov 12 16:20:20 2006 New Revision: 172 Added: sofaswitch/trunk/callflow/docs/description.dxy Removed: sofaswitch/trunk/callflow/docs/executionflow.dxy Log: Rename file and title and page description etc. Added: sofaswitch/trunk/callflow/docs/description.dxy ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/docs/description.dxy Sun Nov 12 16:20:20 2006 @@ -0,0 +1,98 @@ +/*! \page pageCallFlow Detailed description of CallFlow + +\section secIntro Introduction + +We describe the operation of this utilitiy with a series of examples and +associated description. The first part of this document describes the +generation of the graph with the gui, and the second part describes the +running of the graph. + +\section secHelloWorld Hello World example +Perhaps the simplest example of a graph you can create is the standard "Hello +World" example, shown here. + +\image html helloworld.png + +Python will start executing at the very top box, process the code in the +middle, and then terminate at the bottom. Program flow is invariably top to +bottom. Arrows are drawn on the output and input of each box to indicate where +the flow is going. You will notice four black circles, filled, on this +graph. They indicate a connection between the different entitiy. The skull and +crossbones symbol indicates end this graph now. + +\section secForLoop For Loops + +The flow of execution is to follow the graph on the screen. Thus, when +given a graph like + +\image html forloop.png + +it will enter the for loop, and go around and around until the termination +condition is met. The for loop consists of the three boxes in the middle of +this image. On each iteration, a Python command is executed, which is defined +in the Python box in the very middle. You could, of course, put something +different in the middle of the for loop. + +The loop variable, initialisation and termination condition are set at the +start of the for loop. To change these, right click on the for loop box and +adjust accordingly. It will generate an exception if you fail to provide an +entry to the Initialise, Test or Increment fields. If this Python code is +incorrect, it will except also. Notice too that the variables all have the +word "self." as the first half. This ensures that variables in one graph will +not interfere with those of another graph. If you wrote a nested for loop, +they should use different variables. + +While processing each of the nodes in the supplied graph, it is ignoring +all timer events. Execution continues until it falls of the end of the graph, +or passes through an Eventer type structure and goes nowhere. + + +\section secEvent Event handling +We describe the handling of events in this section, with a simple example. +Consider the following graph + +\image html simpleevent.png + +Execution starts at the top, moves to the next node which sends off a request +to obtain a new worker node. Then, the eventer box is entered, where we +register to receive any event that contains the word "NEW" (we are searching +for all events advising of a new node). At which point, execution continues to +the right, and goes into the lower "execute python code" box, which prints a +message. Finally, execution moves into the bottom most box, and stops. + +At this point, we rely upon the twisted module in python to call methods +indicating that things have happened (e.g. a timer, data received from network +etc). On receipt of a message about a new node, the box on the star output of +the eventer is processed. In this case, python code is executed which reports +the id of the voip node created. Execution then moves to the end, and stops. + +Should there be a new event (which we have previously registered for with an +Eventer box) execution will return there. Consequently, in the above example, +every time a new node is created, execution will always move back to the left +most execute python box. + +Note that network events, timer events, other events, are only processed when +execution has stopped. + +\section secUsage Usage - selection cutting pasting etc + +You are going to create a new graph, or edit an existing graph. This is done +by selecting New from the menu, or loading an existing file. + +Individual items in the graph can be moved by left down on the item and +dragging to the desired position. To select and move multiple items, hold the +shift key down and select the desired items, and then drag. Alternatively, +select a region on the screen (left down, move to the opposite corner, left +up), shift button down, and drag. + + + + + + + + + + + +*/ \ No newline at end of file

1 0

[commit] r171 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 12 Nov '06

12 Nov '06

Author: derek Date: Sun Nov 12 16:19:35 2006 New Revision: 171 Modified: sofaswitch/trunk/callflow/docs/executionflow.dxy Log: updates Modified: sofaswitch/trunk/callflow/docs/executionflow.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/executionflow.dxy (original) +++ sofaswitch/trunk/callflow/docs/executionflow.dxy Sun Nov 12 16:19:35 2006 @@ -1,4 +1,4 @@ -/*! \page pageExecutionFlow Flow of execution through python code +/*! \page pageCallFlow Detailed description of CallFlow \section secIntro Introduction

1 0

[commit] r170 - sofaswitch/trunk/sound
by SofaSWITCH SVN 12 Nov '06

12 Nov '06

Author: derek Date: Sun Nov 12 15:56:43 2006 New Revision: 170 Modified: sofaswitch/trunk/sound/audio.cxx sofaswitch/trunk/sound/audio.h Log: Give up on PQueueChannel, and go for a simple simple mutex protected buffer. Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Sun Nov 12 15:56:43 2006 @@ -70,11 +70,10 @@ TestAudioWrite::TestAudioWrite(PUDPSocket &_socket, PSoundChannel &_sound) : TestAudio(_socket, _sound) { - - audioQueue = new PQueueChannel(); - audioQueue->Open(1000); - audioQueue->SetReadTimeout(40); - audioQueue->SetWriteTimeout(40); + memset(silenceBuffer, 0, oneChunk); + memset(buffer, 0, buildSize); + readIndex = 0; + writeIndex = 0; PTRACE(3, "Writer\tInitiate thread for writing " ); Resume(); @@ -82,8 +81,6 @@ TestAudioWrite::~TestAudioWrite() { - audioQueue->Close(); - delete(audioQueue); } void TestAudioWrite::Main() @@ -114,8 +111,17 @@ continue; } PINDEX readSize = socket.GetLastReadCount(); - data.SetSize(readSize); - audioQueue->Write(data.GetPointer(), data.GetSize()); + PWaitAndSignal m(accessMutex); + if ((writeIndex + readSize) < buildSize) { + memcpy (buffer + writeIndex, data.GetPointer(), readSize); + writeIndex += readSize; + } else { + PINDEX firstHalf = buildSize - writeIndex; + PINDEX secondHalf = readSize - firstHalf; + memcpy (buffer + writeIndex, data.GetPointer(), firstHalf); + memcpy(buffer, data.GetPointer() + firstHalf, secondHalf); + writeIndex = secondHalf; + } PTRACE(6, "postWRITE of " << data.GetSize() << " bytes to sound device"); countPackets++; } @@ -133,28 +139,30 @@ void TestAudioWrite::QueueToSpeakerMain(PThread &, INT) { -#define BUFFER_SIZE 1000 - silenceData.SetSize(480); - memset(silenceData.GetPointer(), 0, 480); - incomingData.SetSize(BUFFER_SIZE); - memset(incomingData.GetPointer(), 0, BUFFER_SIZE); - - PINDEX storedCount = 0; while(keepGoing) { - if (audioQueue->Read(incomingData.GetPointer() + storedCount, 240)) { - PINDEX count = audioQueue->GetLastReadCount(); - PTRACE(6, "Read " << count << "bytes from PQueueChannel. to have a total of " << (storedCount + count)); - if ((storedCount + count) > 480) { - sound.Write(incomingData.GetPointer(), 480); - PTRACE(6, "Play 480 bytes to the speaker "); - memcpy(incomingData.GetPointer(), incomingData.GetPointer() + 480, (storedCount + count) - 480); - storedCount = (storedCount + count) - 480; + { + PWaitAndSignal m(accessMutex); + PINDEX available; + if (writeIndex < readIndex) + available = (writeIndex + buildSize) - readIndex; + else + available = writeIndex - readIndex; + if (available > (oneChunk + (oneChunk >> 1))) { + if ((readIndex + oneChunk) < buildSize) { + memcpy (soundBuffer, buffer + readIndex, oneChunk); + readIndex += oneChunk; + } else { + PINDEX firstHalf = buildSize - readIndex; + PINDEX secondHalf = oneChunk - firstHalf; + memcpy(soundBuffer, buffer + readIndex, firstHalf); + memcpy(soundBuffer + firstHalf, buffer, secondHalf); + readIndex = secondHalf; + } } else - storedCount += count; - PTRACE(6, "Have " << storedCount << " byte waiting to be played"); - } else { - sound.Write(silenceData.GetPointer(), 480); + memcpy(soundBuffer, silenceBuffer, oneChunk); } + sound.Write(soundBuffer, oneChunk); + PTRACE(6, "Play " << oneChunk << " bytes to the speaker "); } PTRACE(4, "End of queue to speaker main thread "); Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Sun Nov 12 15:56:43 2006 @@ -1,17 +1,10 @@ /* * audio.h * - * PWLib application header file for sound card + jabber + * PWLib application header file for sound card in a SofaSwitch environment. * * * - * - * - * - * - * - * - * */ #ifndef _AUDIO_H @@ -115,17 +108,35 @@ PDECLARE_NOTIFIER(PThread, TestAudioWrite, QueueToSpeakerMain); #endif + /**The number of bytes in the buffer we use for building sound into + sections of the right size */ + enum { + /** 5000 is 0.3125 of a second of audio data, which is heaps. Such a + large number saves us from wrapping round the end too often.*/ + buildSize= 5000, + /**30 ms of audio */ + oneChunk = 480 + }; + + /**The mutex which protects access to the buffer and buffer variables */ + PMutex accessMutex; - /**The pwlib structure which takes the input sound samples (which may come - in blocks of 160, 240, 320, 480, or other bytes) and glues them - together to give one nice stream of 480 byte blocks. */ - PQueueChannel *audioQueue; + /**The current read index, which goes 0 .. (buildSize -1) */ + PINDEX readIndex; - /**The buffer of data we use to collect incoming data into */ - PBYTEArray incomingData; + /**The current write index, which goes 0 .. (buildSize -1) */ + PINDEX writeIndex; - /**The data we send to the speaker when it is silence time */ - PBYTEArray silenceData; + /**The region of memor for accumulating incoming and outgoing data */ + char buffer[buildSize]; + + /**The buffer used to play silence from if there is not enough audio. This + is not mutex protected. */ + char silenceBuffer[oneChunk]; + + /**The buffer used to contain audio which is given to the speaker. This is + not mutex protected. */ + char soundBuffer[oneChunk]; };

1 0

[commit] r169 - sofaswitch/trunk/sound
by SofaSWITCH SVN 10 Nov '06

10 Nov '06

Author: derek Date: Thu Nov 9 23:17:11 2006 New Revision: 169 Modified: sofaswitch/trunk/sound/audio.cxx sofaswitch/trunk/sound/audio.h Log: Adjust so that if the queue does not supply the requried number of bytes, we make it up prior to writing to the speaker. Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Thu Nov 9 23:17:11 2006 @@ -133,17 +133,31 @@ void TestAudioWrite::QueueToSpeakerMain(PThread &, INT) { - char silenceBuffer[480]; - char audioBuffer[480]; - memset(silenceBuffer, 0, 480); +#define BUFFER_SIZE 1000 + silenceData.SetSize(480); + memset(silenceData.GetPointer(), 0, 480); + incomingData.SetSize(BUFFER_SIZE); + memset(incomingData.GetPointer(), 0, BUFFER_SIZE); + + PINDEX storedCount = 0; while(keepGoing) { - if (audioQueue->Read(audioBuffer, 480)) { + if (audioQueue->Read(incomingData.GetPointer() + storedCount, 240)) { PINDEX count = audioQueue->GetLastReadCount(); - sound.Write(audioBuffer, count); + PTRACE(6, "Read " << count << "bytes from PQueueChannel. to have a total of " << (storedCount + count)); + if ((storedCount + count) > 480) { + sound.Write(incomingData.GetPointer(), 480); + PTRACE(6, "Play 480 bytes to the speaker "); + memcpy(incomingData.GetPointer(), incomingData.GetPointer() + 480, (storedCount + count) - 480); + storedCount = (storedCount + count) - 480; + } else + storedCount += count; + PTRACE(6, "Have " << storedCount << " byte waiting to be played"); } else { - sound.Write(silenceBuffer, 480); + sound.Write(silenceData.GetPointer(), 480); } } + + PTRACE(4, "End of queue to speaker main thread "); } Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Thu Nov 9 23:17:11 2006 @@ -120,6 +120,12 @@ in blocks of 160, 240, 320, 480, or other bytes) and glues them together to give one nice stream of 480 byte blocks. */ PQueueChannel *audioQueue; + + /**The buffer of data we use to collect incoming data into */ + PBYTEArray incomingData; + + /**The data we send to the speaker when it is silence time */ + PBYTEArray silenceData; };

1 0

[commit] r168 - sofaswitch/trunk/sound
by SofaSWITCH SVN 10 Nov '06

10 Nov '06

Author: derek Date: Thu Nov 9 22:20:34 2006 New Revision: 168 Modified: sofaswitch/trunk/sound/audio.cxx sofaswitch/trunk/sound/audio.h Log: Add PQueueChannel to sound, so we cope with receiving smaller packets from the source. Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Thu Nov 9 22:20:34 2006 @@ -12,6 +12,8 @@ */ #include <ptlib.h> +#include <ptclib/qchannel.h> + #include "version.h" #include "audio.h" #include "main.h" @@ -68,10 +70,22 @@ TestAudioWrite::TestAudioWrite(PUDPSocket &_socket, PSoundChannel &_sound) : TestAudio(_socket, _sound) { - PTRACE(3, "Writer\tInitiate thread for writing " ); - Resume(); + + audioQueue = new PQueueChannel(); + audioQueue->Open(1000); + audioQueue->SetReadTimeout(40); + audioQueue->SetWriteTimeout(40); + + PTRACE(3, "Writer\tInitiate thread for writing " ); + Resume(); } +TestAudioWrite::~TestAudioWrite() +{ + audioQueue->Close(); + delete(audioQueue); +} + void TestAudioWrite::Main() { if (!OpenAudio(PSoundChannel::Player)) { @@ -79,7 +93,14 @@ return; } PTRACE(3, "TestAudioWrite\tSound device is now open, start running"); - + + PString threadName = PString("QueueToSpeaker"); + PThread *q2s = PThread::Create(PCREATE_NOTIFIER(QueueToSpeakerMain), 30000, + PThread::NoAutoDeleteThread, + PThread::NormalPriority, + threadName); + + PBYTEArray data; data.SetSize(480); @@ -94,8 +115,7 @@ } PINDEX readSize = socket.GetLastReadCount(); data.SetSize(readSize); - sound.SetBuffers(readSize, 2); - sound.Write(data.GetPointer(), data.GetSize()); + audioQueue->Write(data.GetPointer(), data.GetSize()); PTRACE(6, "postWRITE of " << data.GetSize() << " bytes to sound device"); countPackets++; } @@ -105,7 +125,27 @@ if (!keepGoing) { PTRACE(3, "keepgoing is false"); } + + q2s->WaitForTermination(); + delete q2s; } + + +void TestAudioWrite::QueueToSpeakerMain(PThread &, INT) +{ + char silenceBuffer[480]; + char audioBuffer[480]; + memset(silenceBuffer, 0, 480); + while(keepGoing) { + if (audioQueue->Read(audioBuffer, 480)) { + PINDEX count = audioQueue->GetLastReadCount(); + sound.Write(audioBuffer, count); + } else { + sound.Write(silenceBuffer, 480); + } + } +} + ////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Thu Nov 9 22:20:34 2006 @@ -24,6 +24,8 @@ /**The base class for reading and writing audio from/to the sound device. This class will take audio to/from the PUDPSocket, and transfer it to/from the sound device */ +class PQueueChannel; + class TestAudio : public PThread { PCLASSINFO(TestAudio, PThread); @@ -72,6 +74,8 @@ PINDEX countPackets; }; +///////////////////////////////////////////////////////////////////////////// + /**Override of TestAudio, directed towards Reading from the sound card */ class TestAudioRead : public TestAudio { @@ -84,6 +88,7 @@ void Main(); }; +///////////////////////////////////////////////////////////////////////////// /**Override of TestAudio, directed towards writing to the sound card */ class TestAudioWrite : public TestAudio { @@ -92,8 +97,29 @@ /**Constructor */ TestAudioWrite(PUDPSocket &_socket, PSoundChannel &_sound); + /**Destructor. This deletes the PQueueChannel we allocated in the + constructor */ + ~TestAudioWrite(); + /**the main entry point, where this thread starts */ void Main(); + + protected: + + +#ifdef DOC_PLUS_PLUS + /**This thread runs to transfer data from the audio queue to the speaker + of the sound channel. */ + virtual void QueueToSpeakerMain(PThread &, INT); +#else + PDECLARE_NOTIFIER(PThread, TestAudioWrite, QueueToSpeakerMain); +#endif + + + /**The pwlib structure which takes the input sound samples (which may come + in blocks of 160, 240, 320, 480, or other bytes) and glues them + together to give one nice stream of 480 byte blocks. */ + PQueueChannel *audioQueue; };

1 0