arduino/arduino-audio-tools
1
0
Fork 0
mirror of https://github.com/pschatzmann/arduino-audio-tools.git synced 2024-09-21 18:37:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove copy2() from AudioCopy

Browse Source
This commit is contained in:
Phil Schatzmann 2022-11-15 18:57:58 +01:00
parent dd5ef51e0b
commit 2b3da4ef29
2 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/examples-stream/streams-memory_raw-i2s/streams-memory_raw-i2s.ino
View File

@ -13,7 +13,7 @@
uint8_t channels = 2;
uint8_t channels = 1;
uint16_t sample_rate = 22050;
I2SStream i2s; // Output to I2S
@ -34,7 +34,7 @@ void setup(){
}
void loop(){
if (!copier.copy2()){
if (!copier.copy()){
i2s.end();
stop();
}

45
src/AudioTools/AudioCopy.h
View File

@ -86,7 +86,7 @@ class StreamCopyT {
delete[] buffer;
}
// copies the data from one channel from the source to 2 channels on the destination - the result is in bytes
// copies the data from the source to the destination - the result is in bytes
inline size_t copy(){
TRACED();
// if not initialized we do nothing
@ -144,44 +144,6 @@ class StreamCopyT {
}
// copies the data from one channel from the source to 2 channels on the destination - the result is in bytes
size_t copy2(){
if (from==nullptr || to == nullptr)
return 0;
size_t result = 0;
size_t delayCount = 0;
size_t bytes_read;
size_t len = available();
size_t bytes_to_read;
if (len>0){
bytes_to_read = min(len, static_cast<size_t>(buffer_size / 2));
size_t samples = bytes_to_read / sizeof(T);
bytes_to_read = samples * sizeof(T);
T temp_data[samples];
bytes_read = from->readBytes((uint8_t*)temp_data, bytes_to_read);
// callback with unconverted data
if (onWrite!=nullptr) onWrite(onWriteObj, temp_data, bytes_read);
T* bufferT = (T*) buffer;
for (size_t j=0;j<samples;j++){
*bufferT = temp_data[j];
bufferT++;
*bufferT = temp_data[j];
bufferT++;
}
result = write(samples * sizeof(T)*2, delayCount);
#ifndef COPY_LOG_OFF
LOGI("StreamCopy::copy %u -> %u bytes - in %d hops", (unsigned int)bytes_to_read, (unsigned int)result, delayCount);
#endif
CHECK_MEMORY();
} else {
delay(delay_on_no_data);
}
return result;
}
/// available bytes in the data source
int available() {
return from == nullptr ? 0 : from->available();
@ -370,10 +332,11 @@ class StreamCopy : public StreamCopyT<uint8_t> {
return result;
}
inline size_t copy() {
/// Copies all bytes from the input to the output
inline size_t copy() {
return StreamCopyT<uint8_t>::copy();
}
int available() {
return from == nullptr ? 0 : from->available();
}