deepblue/samplebrain
1
0
Fork 0
mirror of https://gitlab.com/then-try-this/samplebrain.git synced 2025-05-28 09:17:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed stretch

Browse Source
This commit is contained in:
Dave Griffiths 2015-08-06 22:21:30 +01:00
parent 09dc6f633c
commit 2062b282ab
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samplebrain/src/main.cpp
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
*/ */
brain source; brain source;
ifstream ifs("shosta.brain",ios::binary); ifstream ifs("mix.brain",ios::binary);
ifs||source; ifs||source;
ifs.close(); ifs.close();
@ -124,7 +124,7 @@ int main(int argc, char *argv[])
rr.get_params()->m_num_synapses=40; rr.get_params()->m_num_synapses=40;
rr.set_slide_error(3400.5); rr.set_slide_error(3400.5);
rr.set_search_algo(renderer::SYNAPTIC); rr.set_search_algo(renderer::SYNAPTIC);
rr.set_target_mix(0.2); rr.set_target_mix(0.9);
rr.set_stretch(10); rr.set_stretch(10);
a->start_recording("debug"); a->start_recording("debug");
a->m_client.set_callback(run_audio, &rr); a->m_client.set_callback(run_audio, &rr);

45
samplebrain/src/renderer.cpp
View File

@ -33,7 +33,7 @@ void renderer::init(brain &source, brain &target) {
m_search_algo=BASIC; m_search_algo=BASIC;
m_slide_error=1; m_slide_error=1;
m_target_index=0; m_target_index=0;
m_target_counter=0; m_render_index=0;
m_stretch=1; m_stretch=1;
m_last_tgt_shift=0; m_last_tgt_shift=0;
} }
@ -44,7 +44,7 @@ void renderer::reset() {
m_target_time=0; m_target_time=0;
m_render_time=0; m_render_time=0;
m_target_index=0; m_target_index=0;
m_target_counter=0; m_render_index=0;
m_render_blocks.clear(); m_render_blocks.clear();
m_source.jiggle(); m_source.jiggle();
} }
@ -59,15 +59,21 @@ void renderer::process(u32 nframes, float *buf) {
clean_up(); clean_up();
m_render_time+=nframes; m_render_time+=nframes;
m_target_time+=nframes/(float)m_stretch; //m_target_time+=nframes/(float)m_stretch;
} }
// target_time = samples time into target stream
// render_time = position in output stream, updated per process - used for offsets
bool renderer::find_render_blocks(u32 nframes) { bool renderer::find_render_blocks(u32 nframes) {
// get new blocks from source for the current buffer // get new blocks from source for the current buffer
// where are we phase? // where are we phase?
u32 tgt_shift = m_target.get_block_size()-m_target.get_overlap(); u32 tgt_shift = m_target.get_block_size()-m_target.get_overlap();
m_target_index = m_target_time/(float)tgt_shift;
u32 tgt_end = (m_target_time+nframes)/(float)tgt_shift; u32 tgt_end = (m_target_time+nframes)/(float)tgt_shift;
u32 rnd_end = (m_render_time+nframes)/(float)tgt_shift;
// stuff has changed - recompute and abort // stuff has changed - recompute and abort
if (tgt_shift!=m_last_tgt_shift || if (tgt_shift!=m_last_tgt_shift ||
@ -79,23 +85,26 @@ bool renderer::find_render_blocks(u32 nframes) {
return false; return false;
} }
/*
/* cerr<<"-----------------"<<endl; cerr<<"-----------------"<<endl;
cerr<<"tgt start:"<<m_target_index<<endl; cerr<<"tgt start:"<<m_target_index<<endl;
cerr<<"tgt end:"<<tgt_end<<endl; cerr<<"tgt end:"<<tgt_end<<endl;
cerr<<":"<<tgt_end-m_target_index<<endl; cerr<<":"<<tgt_end-m_target_index<<endl;
cerr<<"block time "<<m_target_counter*tgt_shift<<endl;
cerr<<"target time "<<m_target_time<<endl; cerr<<"target time "<<m_target_time<<endl;
cerr<<"target time (index) "<<m_target_index*tgt_shift<<endl;
cerr<<"real vs index = "<<(s32)m_target_time-(s32)(m_target_index*tgt_shift)<<endl;
cerr<<"render time "<<m_render_time<<endl; cerr<<"render time "<<m_render_time<<endl;
cerr<<"render time (index) "<<m_render_index*tgt_shift<<endl;
cerr<<": "<<(s32)m_render_time-(s32)(m_target_time)<<endl;*/ cerr<<"real vs index = "<<(s32)m_render_time-(s32)(m_render_index*tgt_shift)<<endl;
cerr<<m_render_blocks.size()<<endl;
*/
// search phase // search phase
// get indices for current buffer // get indices for current buffer
u32 counter = m_target_index; u32 counter = m_render_index;
//u32 cur_time = m_render_time; //u32 cur_time = m_render_time;
while (counter<=tgt_end) { while (counter<=rnd_end) {
u32 time=m_target_counter*tgt_shift; u32 time=m_render_index*tgt_shift;
u32 src_index=0; u32 src_index=0;
switch (m_search_algo) { switch (m_search_algo) {
@ -115,23 +124,21 @@ bool renderer::find_render_blocks(u32 nframes) {
m_render_blocks.push_back(render_block(src_index,m_target_index,time)); m_render_blocks.push_back(render_block(src_index,m_target_index,time));
if (m_source.get_current_error()<m_slide_error && if (m_source.get_current_error()<m_slide_error &&
m_target_counter%m_stretch==0) { m_render_index%m_stretch==0) {
m_target_index++; m_target_index++;
//m_target_time+=tgt_shift; m_target_time+=tgt_shift;
} }
m_target_counter++;
} else { } else {
// put them in the index list // put them in the index list
m_render_blocks.push_back(render_block(src_index,m_target_index,time)); m_render_blocks.push_back(render_block(src_index,m_target_index,time));
if (m_target_counter%m_stretch==0) { if (m_render_index%m_stretch==0) {
m_target_index++; m_target_index++;
//m_target_time+=tgt_shift; m_target_time+=tgt_shift;
} }
m_target_counter++;
} }
counter++; counter++;
m_render_index++;
} }
return true; return true;
} }
@ -241,7 +248,7 @@ void renderer::old_process(u32 nframes, float *buf) {
u32 counter = m_target_index; u32 counter = m_target_index;
//u32 cur_time = m_render_time; //u32 cur_time = m_render_time;
while (counter<=tgt_end) { while (counter<=tgt_end) {
u32 time=m_target_index*tgt_shift; u32 time=m_render_index*tgt_shift;
u32 src_index=0; u32 src_index=0;
switch (m_search_algo) { switch (m_search_algo) {

2
samplebrain/src/renderer.h
View File

@ -83,7 +83,7 @@ private:
float m_volume; float m_volume;
bool m_playing; bool m_playing;
u32 m_target_index; u32 m_target_index;
u32 m_target_counter; u32 m_render_index;
float m_target_time; float m_target_time;
u32 m_render_time; u32 m_render_time;
u32 m_stretch; u32 m_stretch;