lcoogan
/
flucoma-sc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Condense extra featureFunc args into assocation labe->dictionary; add 'tasks' argument to play

Browse Source 
Update help to reflect
nix
Owen Green 6 years ago
parent db1bbe7780
commit ab3e0e1376
2 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File

21
release-packaging/Classes/FluidCorpusBuilders.sc
Unescape Escape View File

@ -115,20 +115,18 @@ FluidSliceCorpus {
} }
FluidProcessSlices{ FluidProcessSlices{
var < featureFunc, labelFunc; var < featureFunc;
var < index;
*new { |featureFunc, labelFunc| *new { |featureFunc|
^super.newCopyArgs(featureFunc,labelFunc); ^super.newCopyArgs(featureFunc);
} }
play{ |server,sourceBuffer,bufIdx, action| play{ |server, sourceBuffer, bufIdx, action, tasks = 4|
var counter,perf,jobs,total,uid, completed; var counter,perf,jobs,total,uid, completed;
sourceBuffer ?? {"No buffer to slice".error; ^nil}; sourceBuffer ?? {"No buffer to slice".error; ^nil};
bufIdx ?? {"No slice point dictionary passed".error;^nil}; bufIdx ?? {"No slice point dictionary passed".error;^nil};
server ?? {server = Server.default}; server ?? {server = Server.default};
index = IdentityDictionary();
uid = UniqueID.next; uid = UniqueID.next;
jobs = List.newFrom(bufIdx.keys); jobs = List.newFrom(bufIdx.keys);
@ -140,22 +138,25 @@ FluidProcessSlices{
v = bufIdx[k]; v = bufIdx[k];
counter = counter + 1; counter = counter + 1;
idx = counter; idx = counter;
v[\index] = counter;
v[\voice] = jobID;
OSCFunc({ OSCFunc({
completed = completed + 1; completed = completed + 1;
("FluidProcessSlices:" + (completed.asString ++ "/" ++ total)).postln; ("FluidProcessSlices:" + (completed.asString ++ "/" ++ total)).postln;
if(jobs.size > 0){perf.value}; if(jobs.size > 0){perf.value(jobID)};
if(completed == total){action !? action.value(index);}; if(completed == total){action !? action.value(v);};
},"/doneFeature" ++ uid ++ counter,server.addr).oneShot; },"/doneFeature" ++ uid ++ counter,server.addr).oneShot;
{ {
var numframes,feature; var numframes,feature;
numframes = v[\bounds].reverse.reduce('-'); numframes = v[\bounds].reverse.reduce('-');
jobID.postln; jobID.postln;
feature = featureFunc.value(sourceBuffer, v[\bounds][0], numframes, k, v, counter-1, jobID); feature = featureFunc.value(sourceBuffer, v[\bounds][0], numframes, k->v);
SendReply.kr(Done.kr(feature),'/doneFeature' ++ uid ++ idx); SendReply.kr(Done.kr(feature),'/doneFeature' ++ uid ++ idx);
FreeSelfWhenDone.kr(feature); FreeSelfWhenDone.kr(feature);
}.play(server); }.play(server);
}; };
4.do{|jobIDs|perf.value(jobIDs)}; tasks ?? {tasks = 4};
tasks.asInteger.min(jobs.size).do{|jobIDs|perf.value(jobIDs)};
} }
} }

56
release-packaging/HelpSource/Classes/FluidProcessSlices.schelp
Unescape Escape View File

@ -6,7 +6,6 @@ related:: Classes/FluidLoadFolder, Classes/FluidSliceCorpus,Guides/FluidDecompos
DESCRIPTION:: DESCRIPTION::
This class abstracts some of the boilerplate involved in batch processing a sequence of segments in a link::Classes/Buffer:: on the server. It does this by iteratively running a user supplied function and using slice point information passed as an link::Classes/IdentityDictionary:: (see link::Classes/FluidLoadFolder#-index:: for details on the format of this). This class abstracts some of the boilerplate involved in batch processing a sequence of segments in a link::Classes/Buffer:: on the server. It does this by iteratively running a user supplied function and using slice point information passed as an link::Classes/IdentityDictionary:: (see link::Classes/FluidLoadFolder#-index:: for details on the format of this).
CLASSMETHODS:: CLASSMETHODS::
METHOD:: new METHOD:: new
@ -14,7 +13,11 @@ Creates a new instance
ARGUMENT:: featureFunc ARGUMENT:: featureFunc
ANCHOR::featureFunction:: ANCHOR::featureFunction::
A function that will perform some processing on a section of a buffer. It is passed the following arguments A function that will perform some processing on a section of a buffer.
warning::
This function strong::must:: return a link::Classes/UGen:: that sets a code::done:: flag (see link::Classes/Done::), in order for the iteration and housekeeping to work. All code::FluidBuf*:: objects do this.
::
The functions is passed the following arguments
definitionlist:: definitionlist::
##src ##src
|| The source link::Classes/Buffer:: containing the audio to process || The source link::Classes/Buffer:: containing the audio to process
@ -22,24 +25,35 @@ definitionlist::
|| The start frame of the section to process, in samples || The start frame of the section to process, in samples
##num ##num
|| The number of frames to process, in samples || The number of frames to process, in samples
##label ##data
|| The label for the segment from the supplied dictionary to link::#-play:: || anchor::datadict:: An link::Classes/Association:: of the label for this segment, with an link::Classes/IdentityDictionary:: of useful extra data:
definitionlist::
## sr
|| The original sample rate of the segment
## numchans
|| The original channel count of the segment
## voice
|| By default link::#-play:: will run multiple jobs in parallel dependning on the link::#ntasks#tasks:: argument. This contains the task number, which allows you to maintain separate set of resources (e.g. temporary link::Classes/Buffer::s) for each task.
## index
|| The absolute count of slices processed.
:: ::
warning::
This function strong::must:: return a link::Classes/UGen:: that sets a code::done:: flag (see link::Classes/Done::), in order for the iteration and housekeeping to work. All code::FluidBuf*:: objects do this.
:: ::
An example function that records statistics about the pitch of a segment in to a link::Classes/FluidDataSet:: could look like An example function that records statistics about the pitch of a segment in to a link::Classes/FluidDataSet:: could look like
code:: code::
~avgPitch = { |src,start,num,label|
var pitch, stats,statsbuf; ~featureBuffers = 4.do{Buffer.new};
~avgPitch = { |src,start,num,data|
var pitch, stats,statsbuf,label,voice;
label = data.key;
voice = data.value[\voice];
statsbuf = LocalBuf(7); statsbuf = LocalBuf(7);
pitch = FluidBufPitch.kr(src,start,num,features:~someotherbuffer); pitch = FluidBufPitch.kr(src,start,num,features:~featurebuffers[voice]);
stats = FluidBufStats.kr(~someotherbuffer,stats:statsbuf,trig:Done.kr(pitch)); stats = FluidBufStats.kr(~featurebuffers[voice],stats:statsbuf,trig:Done.kr(pitch));
FluidDataSetWr.kr(label,statsbuf,~mydataset,Done.kr(stats)) FluidDataSetWr.kr(label,statsbuf,~mydataset,Done.kr(stats))
} };
:: ::
INSTANCEMETHODS:: INSTANCEMETHODS::
@ -57,7 +71,11 @@ ARGUMENT:: bufIdx
An link::Classes/IdentityDictionary:: specifying labels, boundaries, sample rate and channel count for the segment. See link::Classes/FluidLoadFolder#-index:: for details. An link::Classes/IdentityDictionary:: specifying labels, boundaries, sample rate and channel count for the segment. See link::Classes/FluidLoadFolder#-index:: for details.
ARGUMENT:: action ARGUMENT:: action
A function to run when processing is complete A function to run when processing is complete. This gets passed the same link::Classes/Association:: as link::#datadict#the processing function::
ARGUMENT:: tasks
ANCHOR::ntasks::
The number of parallel processing tasks to run on the server. Default 4. This should probably never be greater than the number of available CPU cores.
METHOD:: featureFunc METHOD:: featureFunc
Return the function uses by this instance. Return the function uses by this instance.
@ -84,11 +102,13 @@ s.reboot;
//In the interests of brevity, let's just take a subset of the slices and process these //In the interests of brevity, let's just take a subset of the slices and process these
~subset = IdentityDictionary.newFrom(~slicer.index.asSortedArray[0..3].flatten(1)); ~subset = IdentityDictionary.newFrom(~slicer.index.asSortedArray[0..3].flatten(1));
//write pitch statistics into a dataset //write pitch statistics into a dataset
~extractor = FluidProcessSlices({|src,start,num,label,data,i| ~extractor = FluidProcessSlices({|src,start,num,data|
var pitch, stats; var pitch, stats, label,i;
pitch = FluidBufPitch.kr(src,start,num,features:~pitchbufs[i]); i = data.value[\voice];
stats = FluidBufStats.kr(~pitchbufs[i],stats:~statsbufs[i],trig:Done.kr(pitch)); label = data.key;
FluidDataSetWr.kr(label,~statsbufs[i],~pitchdata,Done.kr(stats)) pitch = FluidBufPitch.kr(src,start,num,features:~pitchbufs[i]);
stats = FluidBufStats.kr(~pitchbufs[i],stats:~statsbufs[i],trig:Done.kr(pitch));
FluidDataSetWr.kr(label,~statsbufs[i],~pitchdata,Done.kr(stats))
}); });
~extractor.play(s,~loader.buffer,~subset,{"Feature extraction done".postln}); ~extractor.play(s,~loader.buffer,~subset,{"Feature extraction done".postln});
//view the data //view the data

Write Preview
Loading…
Cancel
Save