auracaster/liblc3
3
0
Fork 0
mirror of https://github.com/google/liblc3.git synced 2026-04-18 21:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools & cpp: Add support of asymetric frame sizes of a stereo stream

Browse Source
This commit is contained in:
Antoine Soulier
2024-01-10 14:44:49 -08:00
parent 71ffd784d5
commit 4d014e33e7
7 changed files with 166 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tools/dlc3.c
View File

@@ -31,6 +31,8 @@
#include "lc3bin.h"
#include "wave.h"
#define MAX_CHANNELS 2
#ifndef MIN
#define MIN(a, b) ( (a) < (b) ? (a) : (b) )
#endif
@@ -158,15 +160,15 @@ int main(int argc, char *argv[])
/* --- Check parameters --- */
int frame_us, srate_hz, nch, nsamples;
int frame_us, srate_hz, nchannels, nsamples;
bool hrmode;
if (lc3bin_read_header(fp_in,
&frame_us, &srate_hz, &hrmode, &nch, &nsamples) < 0)
&frame_us, &srate_hz, &hrmode, &nchannels, &nsamples) < 0)
error(EINVAL, "LC3 binary input file");
if (nch < 1 || nch > 2)
error(EINVAL, "Number of channels %d", nch);
if (nchannels < 1 || nchannels > MAX_CHANNELS)
error(EINVAL, "Number of channels %d", nchannels);
if (!LC3_CHECK_DT_US(frame_us))
error(EINVAL, "Frame duration");
@@ -186,7 +188,7 @@ int main(int argc, char *argv[])
((int64_t)nsamples * pcm_srate_hz) / srate_hz;
wave_write_header(fp_out,
pcm_sbits, pcm_sbytes, pcm_srate_hz, nch, pcm_samples);
pcm_sbits, pcm_sbytes, pcm_srate_hz, nchannels, pcm_samples);
/* --- Setup decoding --- */
@@ -200,7 +202,7 @@ int main(int argc, char *argv[])
enum lc3_pcm_format pcm_fmt =
pcm_sbits == 24 ? LC3_PCM_FORMAT_S24_3LE : LC3_PCM_FORMAT_S16;
for (int ich = 0; ich < nch; ich++) {
for (int ich = 0; ich < nchannels; ich++) {
dec[ich] = lc3_hr_setup_decoder(
hrmode, frame_us, srate_hz, p.srate_hz,
malloc(lc3_hr_decoder_size(hrmode, frame_us, pcm_srate_hz)));
@@ -214,11 +216,12 @@ int main(int argc, char *argv[])
static const char *dash_line = "========================================";
int nsec = 0;
int nerr = 0;
unsigned t0 = clock_us();
for (int i = 0; i * frame_samples < encode_samples; i++) {
int frame_bytes = lc3bin_read_data(fp_in, nch, in);
int block_bytes = lc3bin_read_data(fp_in, nchannels, in);
if (floorf(i * frame_us * 1e-6) > nsec) {
@@ -231,19 +234,28 @@ int main(int argc, char *argv[])
nsec = rint(i * frame_us * 1e-6);
}
if (frame_bytes <= 0)
memset(pcm, 0, nch * frame_samples * pcm_sbytes);
else
for (int ich = 0; ich < nch; ich++)
lc3_decode(dec[ich],
in + ich * frame_bytes, frame_bytes,
pcm_fmt, pcm + ich * pcm_sbytes, nch);
if (block_bytes <= 0)
memset(pcm, 0, nchannels * frame_samples * pcm_sbytes);
else {
const uint8_t *in_ptr = in;
for (int ich = 0; ich < nchannels; ich++) {
int frame_bytes = block_bytes / nchannels
+ (ich < block_bytes % nchannels);
int res = lc3_decode(dec[ich], in_ptr, frame_bytes,
pcm_fmt, pcm + ich * pcm_sbytes, nchannels);
nerr += (res != 0);
in_ptr += frame_bytes;
}
}
int pcm_offset = i > 0 ? 0 : encode_samples - pcm_samples;
int pcm_nwrite = MIN(frame_samples - pcm_offset,
encode_samples - i*frame_samples);
wave_write_pcm(fp_out, pcm_sbytes, pcm, nch, pcm_offset, pcm_nwrite);
wave_write_pcm(fp_out,
pcm_sbytes, pcm, nchannels, pcm_offset, pcm_nwrite);
}
unsigned t = (clock_us() - t0) / 1000;
@@ -252,9 +264,12 @@ int main(int argc, char *argv[])
fprintf(stderr, "%02d:%02d Decoded in %d.%03d seconds %20s\n",
nsec / 60, nsec % 60, t / 1000, t % 1000, "");
if (nerr)
fprintf(stderr, "Warning: Decoding of %d frames failed!\n", nerr);
/* --- Cleanup --- */
for (int ich = 0; ich < nch; ich++)
for (int ich = 0; ich < nchannels; ich++)
free(dec[ich]);
if (fp_in != stdin)