Comment additions

master
boblark 3 weeks ago
parent 8fbac3562b
commit ce3a933e05
  1. 2
      AudioSettings_F32.h
  2. 1
      AudioStream_F32.cpp
  3. 66
      AudioStream_F32.h

@ -2,7 +2,7 @@
#ifndef _AudioSettings_F32_ #ifndef _AudioSettings_F32_
#define _AudioSettings_F32_ #define _AudioSettings_F32_
#include <AudioStream.h> // for AUDIO_SAMPLE_RATE_EXACT, AUDIO_BLOCK_SAMPLES #include <AudioStream.h> // 16-bit audio for AUDIO_SAMPLE_RATE_EXACT, AUDIO_BLOCK_SAMPLES
class AudioSettings_F32 { class AudioSettings_F32 {
public: public:

@ -196,4 +196,3 @@ void AudioConnection_F32::connect(void) {
dst.active = true; dst.active = true;
__enable_irq(); __enable_irq();
} }

@ -9,7 +9,38 @@
* *
* Added id to audio_block_f32_t class, per Tympan. Bob Larkin June 2020 * Added id to audio_block_f32_t class, per Tympan. Bob Larkin June 2020
* *
* MIT License. use at your own risk. *
* Thse classes are derived from their equivalents in Teensyduino. Thus:
* Teensyduino Core Library
* http://www.pjrc.com/teensy/
* Copyright (c) 2017 PJRC.COM, LLC.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* 1. The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* 2. If the Software is incorporated into a build system that allows
* selection among a list of target devices, then similar target
* devices manufactured by PJRC.COM must be included in the list of
* target devices and selectable in the same manner.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
* All additions are under MIT License. use at your own risk.
*/ */
#ifndef _AudioStream_F32_h #ifndef _AudioStream_F32_h
@ -32,22 +63,23 @@ class AudioConnection_F32;
//https://github.com/PaulStoffregen/cores/blob/268848cdb0121f26b7ef6b82b4fb54abbe465427/teensy3/AudioStream.h //https://github.com/PaulStoffregen/cores/blob/268848cdb0121f26b7ef6b82b4fb54abbe465427/teensy3/AudioStream.h
// Added id, per Tympan. Should not disturb existing programs. Bob Larkin June 2020 // Added id, per Tympan. Should not disturb existing programs. Bob Larkin June 2020
class audio_block_f32_t { class audio_block_f32_t {
public: public:
audio_block_f32_t(void) {}; audio_block_f32_t(void) {};
audio_block_f32_t(const AudioSettings_F32 &settings) { audio_block_f32_t(const AudioSettings_F32 &settings) {
fs_Hz = settings.sample_rate_Hz; fs_Hz = settings.sample_rate_Hz;
length = settings.audio_block_samples; length = settings.audio_block_samples;
}; };
unsigned char ref_count; unsigned char ref_count;
unsigned char memory_pool_index; unsigned char memory_pool_index;
unsigned char reserved1; unsigned char reserved1;
unsigned char reserved2; unsigned char reserved2;
float32_t data[AUDIO_BLOCK_SAMPLES]; // AUDIO_BLOCK_SAMPLES is 128, from AudioStream.h float32_t data[AUDIO_BLOCK_SAMPLES]; // AUDIO_BLOCK_SAMPLES is 128, from AudioStream.h
const int full_length = AUDIO_BLOCK_SAMPLES; const int full_length = AUDIO_BLOCK_SAMPLES;
int length = AUDIO_BLOCK_SAMPLES; // AUDIO_BLOCK_SAMPLES is 128, from AudioStream.h int length = AUDIO_BLOCK_SAMPLES; // AUDIO_BLOCK_SAMPLES is 128, from AudioStream.h
float fs_Hz = AUDIO_SAMPLE_RATE; // AUDIO_SAMPLE_RATE is 44117.64706 from AudioStream.h // For Teensy 4.x, AUDIO_SAMPLE_RATE is 44100
unsigned long id; float fs_Hz = AUDIO_SAMPLE_RATE; // T3.x AUDIO_SAMPLE_RATE is 44117.64706
unsigned long id;
}; };
class AudioConnection_F32 class AudioConnection_F32

Loading…
Cancel
Save