Skip to content

Commit 11c742c

Browse files
pschatzmannpschatzmann
committed
cleanup codec tests
1 parent 65a99f1 commit 11c742c

File tree

17 files changed

+103
-190
lines changed

17 files changed

+103
-190
lines changed

‎examples/tests/codecs/test-codec-aptx/test-codec-aptx.ino

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecAPTX.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 24000;
16-
uint8_t channels = 2; // The stream will have 2 channels
15+
AudioInfo info(24000, 2, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
//AudioKitStream out;
@@ -30,23 +29,19 @@ void setup() {
3029
// start I2S
3130
Serial.println("starting I2S...");
3231
auto cfgi = out.defaultConfig(TX_MODE);
33-
cfgi.sample_rate = sample_rate;
34-
cfgi.channels = channels;
35-
cfgi.bits_per_sample = 16;
32+
cfgi.copyFrom(info);
3633
out.begin(cfgi);
3734

3835
// Setup sine wave
3936
auto cfgs = sineWave.defaultConfig();
40-
cfgs.sample_rate = sample_rate;
41-
cfgs.channels = channels;
42-
cfgs.bits_per_sample = 16;
43-
sineWave.begin(cfgs, N_B4);
37+
cfgs.copyFrom(info);
38+
sineWave.begin(info, N_B4);
4439

4540
// start decoder
46-
decoder.begin();
41+
decoder.begin(info);
4742

4843
// start encoder
49-
encoder.begin(cfgs);
44+
encoder.begin(info);
5045

5146
Serial.println("Test started...");
5247
}

‎examples/tests/codecs/test-codec-codec2/test-codec-codec2.ino

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
#include "AudioCodecs/CodecCodec2.h"
1616
#include "AudioLibs/AudioKit.h"
1717

18-
uint16_t sample_rate = 8000;
19-
uint8_t channels = 1; // The stream will have 2 channels
18+
AudioInfo info(8000, 1, 16);
2019
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
2120
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
22-
CsvStream<int16_t> out(Serial, channels);
21+
//CsvStream<int16_t> out(Serial, channels);
22+
AudioKitStream out;
2323
EncodedAudioStream decoder(&out, new Codec2Decoder()); // encode and write
2424
EncodedAudioStream encoder(&decoder, new Codec2Encoder()); // encode and write
2525
StreamCopy copier(encoder, sound);
2626

2727

2828
void loop1(void*) {
2929
// setup decoder
30-
decoder.begin();
30+
decoder.begin(info);
3131
// setup encoder
32-
encoder.begin();
32+
encoder.begin(info);
3333
// processing loop
3434
while(true){
3535
copier.copy();
@@ -42,11 +42,11 @@ void setup() {
4242
AudioLogger::instance().begin(Serial, AudioLogger::Warning);
4343

4444
// Setup sine wave
45-
auto cfgs = sineWave.defaultConfig();
46-
cfgs.sample_rate = sample_rate;
47-
cfgs.channels = channels;
48-
cfgs.bits_per_sample = 16;
49-
sineWave.begin(cfgs, N_B4);
45+
sineWave.begin(info, N_B4);
46+
47+
auto cfg = out.defaultConfig();
48+
cfg.copyFrom(info);
49+
out.begin(cfg);
5050

5151
int stack = 20000;
5252
xTaskCreate(loop1,"loopTask", stack, nullptr,1, nullptr);

‎examples/tests/codecs/test-codec-g711_alaw/test-codec-g711_alaw.ino

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecG7xx.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 8000;
16-
uint8_t channels = 1; // The stream will have 2 channels
15+
AudioInfo info(8000, 1, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
AudioKitStream out;
@@ -28,23 +27,17 @@ void setup() {
2827
// start I2S
2928
Serial.println("starting I2S...");
3029
auto cfgi = out.defaultConfig(TX_MODE);
31-
cfgi.sample_rate = sample_rate;
32-
cfgi.channels = channels;
33-
cfgi.bits_per_sample = 16;
30+
cfgi.copyFrom(info);
3431
out.begin(cfgi);
3532

3633
// Setup sine wave
37-
auto cfgs = sineWave.defaultConfig();
38-
cfgs.sample_rate = sample_rate;
39-
cfgs.channels = channels;
40-
cfgs.bits_per_sample = 16;
41-
sineWave.begin(cfgs, N_B4);
34+
sineWave.begin(info, N_B4);
4235

4336
// start decoder
44-
decoder.begin();
37+
decoder.begin(info);
4538

4639
// start encoder
47-
encoder.begin(cfgs);
40+
encoder.begin(info);
4841

4942
Serial.println("Test started...");
5043
}

‎examples/tests/codecs/test-codec-g711_ulaw/test-codec-g711_ulaw.ino

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecG7xx.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 8000;
16-
uint8_t channels = 1; // The stream will have 2 channels
15+
AudioInfo info(8000, 1, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
AudioKitStream out;
@@ -28,23 +27,17 @@ void setup() {
2827
// start I2S
2928
Serial.println("starting I2S...");
3029
auto cfgi = out.defaultConfig(TX_MODE);
31-
cfgi.sample_rate = sample_rate;
32-
cfgi.channels = channels;
33-
cfgi.bits_per_sample = 16;
30+
cfgi.copyFrom(info);
3431
out.begin(cfgi);
3532

3633
// Setup sine wave
37-
auto cfgs = sineWave.defaultConfig();
38-
cfgs.sample_rate = sample_rate;
39-
cfgs.channels = channels;
40-
cfgs.bits_per_sample = 16;
41-
sineWave.begin(cfgs, N_B4);
34+
sineWave.begin(info, N_B4);
4235

4336
// start decoder
44-
decoder.begin();
37+
decoder.begin(info);
4538

4639
// start encoder
47-
encoder.begin(cfgs);
40+
encoder.begin(info);
4841

4942
Serial.println("Test started...");
5043
}

‎examples/tests/codecs/test-codec-g721/test-codec-g721.ino

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecG7xx.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 8000;
16-
uint8_t channels = 1; // The stream will have 2 channels
15+
AudioInfo info(8000, 1, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
AudioKitStream out;
@@ -28,23 +27,17 @@ void setup() {
2827
// start I2S
2928
Serial.println("starting I2S...");
3029
auto cfgi = out.defaultConfig(TX_MODE);
31-
cfgi.sample_rate = sample_rate;
32-
cfgi.channels = channels;
33-
cfgi.bits_per_sample = 16;
30+
cfgi.copyFrom(info);
3431
out.begin(cfgi);
3532

3633
// Setup sine wave
37-
auto cfgs = sineWave.defaultConfig();
38-
cfgs.sample_rate = sample_rate;
39-
cfgs.channels = channels;
40-
cfgs.bits_per_sample = 16;
41-
sineWave.begin(cfgs, N_B4);
34+
sineWave.begin(info, N_B4);
4235

4336
// start decoder
44-
decoder.begin();
37+
decoder.begin(info);
4538

4639
// start encoder
47-
encoder.begin(cfgs);
40+
encoder.begin(info);
4841

4942
Serial.println("Test started...");
5043
}

‎examples/tests/codecs/test-codec-g722/test-codec-g722.ino

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecG722.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 24000;
16-
uint8_t channels = 1; // The stream will have 2 channels
15+
AudioInfo info(24000, 1, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
AudioKitStream out;
@@ -29,23 +28,17 @@ void setup() {
2928
// start I2S
3029
Serial.println("starting I2S...");
3130
auto cfgi = out.defaultConfig(TX_MODE);
32-
cfgi.sample_rate = sample_rate;
33-
cfgi.channels = channels;
34-
cfgi.bits_per_sample = 16;
31+
cfgi.copyFrom(info);
3532
out.begin(cfgi);
3633

3734
// Setup sine wave
38-
auto cfgs = sineWave.defaultConfig();
39-
cfgs.sample_rate = sample_rate;
40-
cfgs.channels = channels;
41-
cfgs.bits_per_sample = 16;
42-
sineWave.begin(cfgs, N_B4);
35+
sineWave.begin(info, N_B4);
4336

4437
// start decoder
45-
decoder.begin();
38+
decoder.begin(info);
4639

4740
// start encoder
48-
encoder.begin(cfgs);
41+
encoder.begin(info);
4942

5043
Serial.println("Test started...");
5144
}

‎examples/tests/codecs/test-codec-g723_24/test-codec-g723_24.ino

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecG7xx.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 8000;
16-
uint8_t channels = 1; // The stream will have 2 channels
15+
AudioInfo info(8000, 1, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
AudioKitStream out;
@@ -28,23 +27,17 @@ void setup() {
2827
// start I2S
2928
Serial.println("starting I2S...");
3029
auto cfgi = out.defaultConfig(TX_MODE);
31-
cfgi.sample_rate = sample_rate;
32-
cfgi.channels = channels;
33-
cfgi.bits_per_sample = 16;
30+
cfgi.copyFrom(info);
3431
out.begin(cfgi);
3532

3633
// Setup sine wave
37-
auto cfgs = sineWave.defaultConfig();
38-
cfgs.sample_rate = sample_rate;
39-
cfgs.channels = channels;
40-
cfgs.bits_per_sample = 16;
41-
sineWave.begin(cfgs, N_B4);
34+
sineWave.begin(info, N_B4);
4235

4336
// start decoder
44-
decoder.begin();
37+
decoder.begin(info);
4538

4639
// start encoder
47-
encoder.begin(cfgs);
40+
encoder.begin(info);
4841

4942
Serial.println("Test started...");
5043
}

‎examples/tests/codecs/test-codec-g723_40/test-codec-g723_40.ino

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecG7xx.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 8000;
16-
uint8_t channels = 1; // The stream will have 2 channels
15+
AudioInfo info(8000, 1, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
AudioKitStream out;
@@ -28,23 +27,17 @@ void setup() {
2827
// start I2S
2928
Serial.println("starting I2S...");
3029
auto cfgi = out.defaultConfig(TX_MODE);
31-
cfgi.sample_rate = sample_rate;
32-
cfgi.channels = channels;
33-
cfgi.bits_per_sample = 16;
30+
cfgi.copyFrom(info);
3431
out.begin(cfgi);
3532

3633
// Setup sine wave
37-
auto cfgs = sineWave.defaultConfig();
38-
cfgs.sample_rate = sample_rate;
39-
cfgs.channels = channels;
40-
cfgs.bits_per_sample = 16;
41-
sineWave.begin(cfgs, N_B4);
34+
sineWave.begin(info, N_B4);
4235

4336
// start decoder
44-
decoder.begin();
37+
decoder.begin(info);
4538

4639
// start encoder
47-
encoder.begin(cfgs);
40+
encoder.begin(info);
4841

4942
Serial.println("Test started...");
5043
}

‎examples/tests/codecs/test-codec-gsm/test-codec-gsm.ino

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecGSM.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 8000;
16-
uint8_t channels = 1; // The stream will have 2 channels
15+
AudioInfo info(8000, 1, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
AudioKitStream out;
@@ -28,23 +27,17 @@ void setup() {
2827
// start I2S
2928
Serial.println("starting I2S...");
3029
auto cfgi = out.defaultConfig(TX_MODE);
31-
cfgi.sample_rate = sample_rate;
32-
cfgi.channels = channels;
33-
cfgi.bits_per_sample = 16;
30+
cfgi.copyFrom(info);
3431
out.begin(cfgi);
3532

3633
// Setup sine wave
37-
auto cfgs = sineWave.defaultConfig();
38-
cfgs.sample_rate = sample_rate;
39-
cfgs.channels = channels;
40-
cfgs.bits_per_sample = 16;
41-
sineWave.begin(cfgs, N_B4);
34+
sineWave.begin(info, N_B4);
4235

4336
// start decoder
44-
decoder.begin();
37+
decoder.begin(info);
4538

4639
// start encoder
47-
encoder.begin(cfgs);
40+
encoder.begin(info);
4841

4942
Serial.println("Test started...");
5043
}

‎examples/tests/codecs/test-codec-iLBC/test-codec-iLBC.ino

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "AudioCodecs/CodecILBC.h"
1313
#include "AudioLibs/AudioKit.h"
1414

15-
uint16_t sample_rate = 8000;
16-
uint8_t channels = 1; // The stream will have 2 channels
15+
AudioInfo info(8000, 1, 16);
1716
SineWaveGenerator<int16_t> sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000
1817
GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
1918
AudioKitStream out;
@@ -29,23 +28,17 @@ void setup() {
2928
// start I2S
3029
Serial.println("starting I2S...");
3130
auto cfgi = out.defaultConfig(TX_MODE);
32-
cfgi.sample_rate = sample_rate;
33-
cfgi.channels = channels;
34-
cfgi.bits_per_sample = 16;
31+
cfgi.copyFrom(info);
3532
out.begin(cfgi);
3633

3734
// Setup sine wave
38-
auto cfgs = sineWave.defaultConfig();
39-
cfgs.sample_rate = sample_rate;
40-
cfgs.channels = channels;
41-
cfgs.bits_per_sample = 16;
42-
sineWave.begin(cfgs, N_B4);
35+
sineWave.begin(info, N_B4);
4336

4437
// start decoder
45-
decoder.begin();
38+
decoder.begin(info);
4639

4740
// start encoder
48-
encoder.begin(cfgs);
41+
encoder.begin(info);
4942

5043
Serial.println("Test started...");
5144
}

0 commit comments

Comments
 (0)