mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-14 02:27:39 -04:00
Add WAV-writing option - currently limited to 16-bit output only; Make it work in the sim again (after the change to grab the codec thread stack); Some cosmetic cleanups.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13376 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman
parent
c9ed673c81
commit
3463e87220
1 changed files with 289 additions and 37 deletions
|
|
@ -22,6 +22,16 @@ PLUGIN_HEADER
|
|||
|
||||
static struct plugin_api* rb;
|
||||
|
||||
struct wavinfo_t
|
||||
{
|
||||
int fd;
|
||||
int samplerate;
|
||||
int channels;
|
||||
int sampledepth;
|
||||
int stereomode;
|
||||
int totalsamples;
|
||||
};
|
||||
|
||||
static void* audiobuf;
|
||||
static void* codec_mallocbuf;
|
||||
static size_t audiosize;
|
||||
|
|
@ -35,6 +45,85 @@ static bool taginfo_ready = true;
|
|||
|
||||
static volatile unsigned int elapsed;
|
||||
static volatile bool codec_playing;
|
||||
struct wavinfo_t wavinfo;
|
||||
|
||||
static unsigned char wav_header[44] =
|
||||
{
|
||||
'R','I','F','F', // 0 - ChunkID
|
||||
0,0,0,0, // 4 - ChunkSize (filesize-8)
|
||||
'W','A','V','E', // 8 - Format
|
||||
'f','m','t',' ', // 12 - SubChunkID
|
||||
16,0,0,0, // 16 - SubChunk1ID // 16 for PCM
|
||||
1,0, // 20 - AudioFormat (1=16-bit)
|
||||
0,0, // 22 - NumChannels
|
||||
0,0,0,0, // 24 - SampleRate in Hz
|
||||
0,0,0,0, // 28 - Byte Rate (SampleRate*NumChannels*(BitsPerSample/8)
|
||||
0,0, // 32 - BlockAlign (== NumChannels * BitsPerSample/8)
|
||||
16,0, // 34 - BitsPerSample
|
||||
'd','a','t','a', // 36 - Subchunk2ID
|
||||
0,0,0,0 // 40 - Subchunk2Size
|
||||
};
|
||||
|
||||
static inline void int2le32(unsigned char* buf, int32_t x)
|
||||
{
|
||||
buf[0] = (x & 0xff);
|
||||
buf[1] = (x & 0xff00) >> 8;
|
||||
buf[2] = (x & 0xff0000) >> 16;
|
||||
buf[3] = (x & 0xff000000) >>24;
|
||||
}
|
||||
|
||||
static inline void int2le24(unsigned char* buf, int32_t x)
|
||||
{
|
||||
buf[0] = (x & 0xff);
|
||||
buf[1] = (x & 0xff00) >> 8;
|
||||
buf[2] = (x & 0xff0000) >> 16;
|
||||
}
|
||||
|
||||
static inline void int2le16(unsigned char* buf, int16_t x)
|
||||
{
|
||||
buf[0] = (x & 0xff);
|
||||
buf[1] = (x & 0xff00) >> 8;
|
||||
}
|
||||
|
||||
void init_wav(char* filename)
|
||||
{
|
||||
wavinfo.totalsamples = 0;
|
||||
|
||||
wavinfo.fd = rb->creat(filename);
|
||||
|
||||
if (wavinfo.fd >= 0)
|
||||
{
|
||||
/* Write WAV header - we go back and fill in the details at the end */
|
||||
rb->write(wavinfo.fd, wav_header, sizeof(wav_header));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void close_wav(void) {
|
||||
int filesize = rb->filesize(wavinfo.fd);
|
||||
int channels = (wavinfo.stereomode == STEREO_MONO) ? 1 : 2;
|
||||
int bps = 16; /* TODO */
|
||||
|
||||
/* We assume 16-bit, Stereo */
|
||||
|
||||
rb->lseek(wavinfo.fd,0,SEEK_SET);
|
||||
|
||||
int2le32(wav_header+4, filesize-8); /* ChunkSize */
|
||||
|
||||
int2le16(wav_header+22, channels);
|
||||
|
||||
int2le32(wav_header+24, wavinfo.samplerate);
|
||||
|
||||
int2le32(wav_header+28, wavinfo.samplerate * channels * (bps / 8)); /* ByteRate */
|
||||
|
||||
int2le16(wav_header+32, channels * (bps / 8));
|
||||
|
||||
int2le32(wav_header+40, filesize - 44); /* Subchunk2Size */
|
||||
|
||||
rb->write(wavinfo.fd, wav_header, sizeof(wav_header));
|
||||
|
||||
rb->close(wavinfo.fd);
|
||||
}
|
||||
|
||||
/* Returns buffer to malloc array. Only codeclib should need this. */
|
||||
static void* get_codec_memory(size_t *size)
|
||||
|
|
@ -44,9 +133,8 @@ static void* get_codec_memory(size_t *size)
|
|||
return codec_mallocbuf;
|
||||
}
|
||||
|
||||
/* Insert PCM data into audio buffer for playback. Playback will start
|
||||
automatically. */
|
||||
static bool pcmbuf_insert(const void *ch1, const void *ch2, int count)
|
||||
/* Null output */
|
||||
static bool pcmbuf_insert_null(const void *ch1, const void *ch2, int count)
|
||||
{
|
||||
/* Always successful - just discard data */
|
||||
(void)ch1;
|
||||
|
|
@ -56,6 +144,100 @@ static bool pcmbuf_insert(const void *ch1, const void *ch2, int count)
|
|||
return true;
|
||||
}
|
||||
|
||||
/* 64KB should be enough */
|
||||
static unsigned char wavbuffer[64*1024];
|
||||
|
||||
static inline int32_t clip_sample(int32_t sample)
|
||||
{
|
||||
if ((int16_t)sample != sample)
|
||||
sample = 0x7fff ^ (sample >> 31);
|
||||
|
||||
return sample;
|
||||
}
|
||||
|
||||
|
||||
/* WAV output */
|
||||
static bool pcmbuf_insert_wav(const void *ch1, const void *ch2, int count)
|
||||
{
|
||||
const int16_t* data1_16;
|
||||
const int16_t* data2_16;
|
||||
const int32_t* data1_32;
|
||||
const int32_t* data2_32;
|
||||
unsigned char* p = wavbuffer;
|
||||
int scale = wavinfo.sampledepth - 15;
|
||||
|
||||
if (wavinfo.sampledepth <= 16) {
|
||||
data1_16 = ch1;
|
||||
data2_16 = ch2;
|
||||
|
||||
switch(wavinfo.stereomode)
|
||||
{
|
||||
case STEREO_INTERLEAVED:
|
||||
while (count--) {
|
||||
int2le16(p,*data1_16++);
|
||||
p += 2;
|
||||
int2le16(p,*data1_16++);
|
||||
p += 2;
|
||||
}
|
||||
break;
|
||||
|
||||
case STEREO_NONINTERLEAVED:
|
||||
while (count--) {
|
||||
int2le16(p,*data1_16++);
|
||||
p += 2;
|
||||
int2le16(p,*data2_16++);
|
||||
p += 2;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case STEREO_MONO:
|
||||
while (count--) {
|
||||
int2le16(p,*data1_16++);
|
||||
p += 2;
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
data1_32 = ch1;
|
||||
data2_32 = ch2;
|
||||
|
||||
switch(wavinfo.stereomode)
|
||||
{
|
||||
case STEREO_INTERLEAVED:
|
||||
while (count--) {
|
||||
int2le16(p, clip_sample((*data1_32++) >> scale));
|
||||
p += 2;
|
||||
int2le16(p, clip_sample((*data1_32++) >> scale));
|
||||
p += 2;
|
||||
}
|
||||
break;
|
||||
|
||||
case STEREO_NONINTERLEAVED:
|
||||
while (count--) {
|
||||
int2le16(p, clip_sample((*data1_32++) >> scale));
|
||||
p += 2;
|
||||
int2le16(p, clip_sample((*data2_32++) >> scale));
|
||||
p += 2;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case STEREO_MONO:
|
||||
while (count--) {
|
||||
int2le16(p, clip_sample((*data1_32++) >> scale));
|
||||
p += 2;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
wavinfo.totalsamples += count;
|
||||
rb->write(wavinfo.fd, wavbuffer, p - wavbuffer);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/* Set song position in WPS (value in ms). */
|
||||
static void set_elapsed(unsigned int value)
|
||||
|
|
@ -68,7 +250,6 @@ static void set_elapsed(unsigned int value)
|
|||
Will return number of bytes read or 0 if end of file. */
|
||||
static size_t read_filebuf(void *ptr, size_t size)
|
||||
{
|
||||
DEBUGF("read_filebuf(_,%d)\n",(int)size);
|
||||
if (ci.curpos > (off_t)track.filesize)
|
||||
{
|
||||
return 0;
|
||||
|
|
@ -76,7 +257,6 @@ static size_t read_filebuf(void *ptr, size_t size)
|
|||
/* TODO: Don't read beyond end of buffer */
|
||||
rb->memcpy(ptr, audiobuf + ci.curpos, size);
|
||||
ci.curpos += size;
|
||||
DEBUGF("New ci.curpos = %d\n",ci.curpos);
|
||||
return size;
|
||||
}
|
||||
}
|
||||
|
|
@ -98,7 +278,6 @@ static void* request_buffer(size_t *realsize, size_t reqsize)
|
|||
static void advance_buffer(size_t amount)
|
||||
{
|
||||
ci.curpos += amount;
|
||||
DEBUGF("advance_buffer(%d) - new ci.curpos=%d\n",(int)amount,(int)ci.curpos);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -152,7 +331,6 @@ static void discard_codec(void)
|
|||
|
||||
static void set_offset(size_t value)
|
||||
{
|
||||
DEBUGF("set_offset(%d)\n",(int)value);
|
||||
/* ??? */
|
||||
(void)value;
|
||||
}
|
||||
|
|
@ -161,9 +339,25 @@ static void set_offset(size_t value)
|
|||
/* Configure different codec buffer parameters. */
|
||||
static void configure(int setting, intptr_t value)
|
||||
{
|
||||
(void)setting;
|
||||
(void)value;
|
||||
DEBUGF("setting %d = %d\n",setting,(int)value);
|
||||
switch(setting)
|
||||
{
|
||||
case DSP_SWITCH_FREQUENCY:
|
||||
case DSP_SET_FREQUENCY:
|
||||
DEBUGF("samplerate=%d\n",(int)value);
|
||||
wavinfo.samplerate = (int)value;
|
||||
break;
|
||||
|
||||
case DSP_SET_SAMPLE_DEPTH:
|
||||
DEBUGF("sampledepth = %d\n",(int)value);
|
||||
wavinfo.sampledepth=(int)value;
|
||||
break;
|
||||
|
||||
case DSP_SET_STEREO_MODE:
|
||||
DEBUGF("Stereo mode = %d\n",(int)value);
|
||||
wavinfo.stereomode=(int)value;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void init_ci(void)
|
||||
|
|
@ -171,7 +365,12 @@ static void init_ci(void)
|
|||
/* --- Our "fake" implementations of the codec API functions. --- */
|
||||
|
||||
ci.get_codec_memory = get_codec_memory;
|
||||
ci.pcmbuf_insert = pcmbuf_insert;
|
||||
|
||||
if (wavinfo.fd >= 0) {
|
||||
ci.pcmbuf_insert = pcmbuf_insert_wav;
|
||||
} else {
|
||||
ci.pcmbuf_insert = pcmbuf_insert_null;
|
||||
}
|
||||
ci.set_elapsed = set_elapsed;
|
||||
ci.read_filebuf = read_filebuf;
|
||||
ci.request_buffer = request_buffer;
|
||||
|
|
@ -244,6 +443,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
|||
size_t n;
|
||||
int fd;
|
||||
int i;
|
||||
enum plugin_status res = PLUGIN_OK;
|
||||
unsigned long starttick;
|
||||
unsigned long ticks;
|
||||
unsigned long speed;
|
||||
|
|
@ -252,6 +452,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
|||
unsigned char* codec_stack_copy;
|
||||
size_t codec_stack_size;
|
||||
struct thread_entry* codecthread_id;
|
||||
int result;
|
||||
char* ch;
|
||||
int line = 0;
|
||||
|
||||
rb = api;
|
||||
|
||||
|
|
@ -261,6 +464,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
|||
return PLUGIN_ERROR;
|
||||
}
|
||||
|
||||
#ifdef SIMULATOR
|
||||
/* The simulator thread implementation doesn't have stack buffers */
|
||||
(void)i;
|
||||
#else
|
||||
/* Borrow the codec thread's stack (in IRAM on most targets) */
|
||||
codec_stack = NULL;
|
||||
for (i = 0; i < MAXTHREADS; i++)
|
||||
|
|
@ -278,14 +485,17 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
|||
rb->splash(HZ*2, "No codec thread!");
|
||||
return PLUGIN_ERROR;
|
||||
}
|
||||
#endif
|
||||
|
||||
codec_mallocbuf = rb->plugin_get_audio_buffer(&audiosize);
|
||||
codec_stack_copy = codec_mallocbuf + 512*1024;
|
||||
audiobuf = codec_stack_copy + codec_stack_size;
|
||||
audiosize -= 512*1024 + codec_stack_size;
|
||||
|
||||
#ifndef SIMULATOR
|
||||
/* Backup the codec thread's stack */
|
||||
rb->memcpy(codec_stack_copy,codec_stack,codec_stack_size);
|
||||
#endif
|
||||
|
||||
fd = rb->open(parameter,O_RDONLY);
|
||||
if (fd < 0)
|
||||
|
|
@ -309,14 +519,46 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
|||
return PLUGIN_ERROR;
|
||||
}
|
||||
|
||||
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
|
||||
rb->cpu_boost(true);
|
||||
#endif
|
||||
rb->lcd_clear_display();
|
||||
rb->lcd_update();
|
||||
|
||||
MENUITEM_STRINGLIST(menu,"test_codec",NULL,"Speed test","Write WAV");
|
||||
|
||||
rb->lcd_clear_display();
|
||||
|
||||
DEBUGF("Calling menu\n");
|
||||
result=rb->do_menu(&menu,&result);
|
||||
DEBUGF("Done\n");
|
||||
|
||||
if (result==1) {
|
||||
init_wav("/test.wav");
|
||||
if (wavinfo.fd < 0) {
|
||||
rb->splash(HZ*2, "Cannot create /test.wav");
|
||||
res = PLUGIN_ERROR;
|
||||
goto exit;
|
||||
}
|
||||
} else if (result == MENU_ATTACHED_USB) {
|
||||
res = PLUGIN_USB_CONNECTED;
|
||||
goto exit;
|
||||
} else if (result < 0) {
|
||||
res = PLUGIN_OK;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
rb->lcd_clear_display();
|
||||
rb->splash(0, "Loading...");
|
||||
rb->lcd_clear_display();
|
||||
|
||||
n = rb->read(fd, audiobuf, track.filesize);
|
||||
|
||||
if (n != track.filesize)
|
||||
{
|
||||
rb->splash(HZ*2, "Read failed.");
|
||||
return PLUGIN_ERROR;
|
||||
res = PLUGIN_ERROR;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/* Initialise the function pointers in the codec API */
|
||||
|
|
@ -331,15 +573,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
|||
ci.new_track = 0;
|
||||
ci.seek_time = 0;
|
||||
|
||||
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
|
||||
rb->cpu_boost(true);
|
||||
#endif
|
||||
rb->lcd_set_backdrop(NULL);
|
||||
rb->lcd_set_foreground(LCD_WHITE);
|
||||
rb->lcd_set_background(LCD_BLACK);
|
||||
rb->lcd_clear_display();
|
||||
rb->lcd_update();
|
||||
|
||||
starttick = *rb->current_tick;
|
||||
|
||||
codec_playing = true;
|
||||
|
|
@ -352,44 +585,63 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
|
|||
goto exit;
|
||||
}
|
||||
|
||||
/* Display filename (excluding any path)*/
|
||||
ch = rb->strrchr(parameter, '/');
|
||||
if (ch==NULL)
|
||||
ch = parameter;
|
||||
else
|
||||
ch++;
|
||||
|
||||
rb->snprintf(str,sizeof(str),"%s",ch);
|
||||
rb->lcd_puts(0,line++,str);
|
||||
|
||||
/* Wait for codec thread to die */
|
||||
while (codec_playing)
|
||||
{
|
||||
rb->sleep(HZ);
|
||||
rb->snprintf(str,sizeof(str),"%d of %d",elapsed,(int)track.id3.length);
|
||||
rb->lcd_puts(0,0,str);
|
||||
rb->lcd_puts(0,line,str);
|
||||
rb->lcd_update();
|
||||
}
|
||||
line++;
|
||||
|
||||
/* Close WAV file (if there was one) */
|
||||
if (wavinfo.fd >= 0) {
|
||||
close_wav();
|
||||
rb->lcd_puts(0,line++,"Wrote /test.wav");
|
||||
} else {
|
||||
/* Display benchmark information */
|
||||
|
||||
/* Display benchmark information */
|
||||
ticks = *rb->current_tick - starttick;
|
||||
rb->snprintf(str,sizeof(str),"Decode time - %d.%02ds",(int)ticks/100,(int)ticks%100);
|
||||
rb->lcd_puts(0,line++,str);
|
||||
|
||||
ticks = *rb->current_tick - starttick;
|
||||
rb->snprintf(str,sizeof(str),"Decode time - %d.%02ds",(int)ticks/100,(int)ticks%100);
|
||||
rb->lcd_puts(0,1,str);
|
||||
duration = track.id3.length / 10;
|
||||
rb->snprintf(str,sizeof(str),"File duration - %d.%02ds",(int)duration/100,(int)duration%100);
|
||||
rb->lcd_puts(0,line++,str);
|
||||
|
||||
duration = track.id3.length / 10;
|
||||
rb->snprintf(str,sizeof(str),"File duration - %d.%02ds",(int)duration/100,(int)duration%100);
|
||||
rb->lcd_puts(0,2,str);
|
||||
if (ticks > 0)
|
||||
speed = duration * 10000 / ticks;
|
||||
else
|
||||
speed = 0;
|
||||
|
||||
if (ticks > 0)
|
||||
speed = duration * 10000 / ticks;
|
||||
else
|
||||
speed = 0;
|
||||
|
||||
rb->snprintf(str,sizeof(str),"%d.%02d%% realtime",(int)speed/100,(int)speed%100);
|
||||
rb->lcd_puts(0,3,str);
|
||||
rb->snprintf(str,sizeof(str),"%d.%02d%% realtime",(int)speed/100,(int)speed%100);
|
||||
rb->lcd_puts(0,line++,str);
|
||||
|
||||
}
|
||||
rb->lcd_update();
|
||||
|
||||
while (rb->button_get(true) != BUTTON_SELECT);
|
||||
|
||||
exit:
|
||||
#ifndef SIMULATOR
|
||||
/* Restore the codec thread's stack */
|
||||
rb->memcpy(codec_stack, codec_stack_copy, codec_stack_size);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
|
||||
rb->cpu_boost(false);
|
||||
#endif
|
||||
|
||||
return PLUGIN_OK;
|
||||
return res;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue