From 9b32a1988f848145d96ba2be8cba86e837196df3 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Wed, 16 Feb 2005 18:51:21 +0000 Subject: Move contents of plugins/xxx2wav.h into the plugin library git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5982 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/a52towav.c | 10 +- apps/plugins/lib/SOURCES | 3 + apps/plugins/lib/xxx2wav.c | 224 +++++++++++++++++++++++++++++++++++++++++ apps/plugins/lib/xxx2wav.h | 55 +++++++++++ apps/plugins/mpa2wav.c | 8 +- apps/plugins/xxx2wav.h | 241 --------------------------------------------- 6 files changed, 290 insertions(+), 251 deletions(-) create mode 100644 apps/plugins/lib/xxx2wav.c create mode 100644 apps/plugins/lib/xxx2wav.h delete mode 100644 apps/plugins/xxx2wav.h diff --git a/apps/plugins/a52towav.c b/apps/plugins/a52towav.c index 3e81c9db0c..f62106a8c3 100644 --- a/apps/plugins/a52towav.c +++ b/apps/plugins/a52towav.c @@ -27,11 +27,9 @@ #include #include -static struct plugin_api* rb; - -/* Helper functions common to all decoder test viewers (uses rb) */ +#include "lib/xxx2wav.h" /* Helper functions common to test decoders */ -#include "xxx2wav.h" +static struct plugin_api* rb; /* FIX: We can remove this warning when the build system has a mechanism for auto-detecting the endianness of the target CPU - @@ -167,6 +165,8 @@ void a52_decode_data (file_info_struct* file_info, uint8_t * start, uint8_t * en /* this is the plugin entry point */ enum plugin_status plugin_start(struct plugin_api* api, void* file) { + file_info_struct file_info; + /* Generic plugin initialisation */ TEST_PLUGIN_API(api); @@ -175,7 +175,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) /* This function sets up the buffers and reads the file into RAM */ - if (local_init(file,"/ac3test.wav",&file_info)) { + if (local_init(file,"/ac3test.wav",&file_info,api)) { return PLUGIN_ERROR; } diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index 8bd47a25b0..0e8e14cbdf 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES @@ -33,3 +33,6 @@ gray_verline.c #ifdef HAVE_LCD_CHARCELLS playergfx.c #endif +#if CONFIG_HWCODEC == MASNONE /* software codec platforms */ +xxx2wav.c +#endif diff --git a/apps/plugins/lib/xxx2wav.c b/apps/plugins/lib/xxx2wav.c new file mode 100644 index 0000000000..92b7050f6d --- /dev/null +++ b/apps/plugins/lib/xxx2wav.c @@ -0,0 +1,224 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2005 Dave Chapman + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +/* Various "helper functions" common to all the xxx2wav decoder plugins */ + +#include "plugin.h" +#include "xxx2wav.h" + +static struct plugin_api* local_rb; + +int mem_ptr; +int bufsize; +unsigned char* mp3buf; // The actual MP3 buffer from Rockbox +unsigned char* mallocbuf; // 512K from the start of MP3 buffer +unsigned char* filebuf; // The rest of the MP3 buffer + +void* malloc(size_t size) { + void* x; + char s[32]; + + x=&mallocbuf[mem_ptr]; + mem_ptr+=size+(size%4); // Keep memory 32-bit aligned (if it was already?) + + local_rb->snprintf(s,30,"Memory used: %d",mem_ptr); + local_rb->lcd_putsxy(0,80,s); + local_rb->lcd_update(); + return(x); +} + +void* calloc(size_t nmemb, size_t size) { + void* x; + x=malloc(nmemb*size); + local_rb->memset(x,0,nmemb*size); + return(x); +} + +void free(void* ptr) { + (void)ptr; +} + +void* realloc(void* ptr, size_t size) { + void* x; + (void)ptr; + x=malloc(size); + return(x); +} + +void *memcpy(void *dest, const void *src, size_t n) { + return(local_rb->memcpy(dest,src,n)); +} + +void *memset(void *s, int c, size_t n) { + return(local_rb->memset(s,c,n)); +} + +int memcmp(const void *s1, const void *s2, size_t n) { + return(local_rb->memcmp(s1,s2,n)); +} + +void* memmove(const void *s1, const void *s2, size_t n) { + char* dest=(char*)s1; + char* src=(char*)s2; + size_t i; + + for (i=0;i0) { *(dest++)=*(src++); n--; } + return(dest); +} + +void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)) { + local_rb->qsort(base,nmemb,size,compar); +} + +void display_status(file_info_struct* file_info) { + char s[32]; + unsigned long ticks_taken; + unsigned long long speed; + unsigned long xspeed; + + local_rb->snprintf(s,32,"Bytes read: %d",file_info->curpos); + local_rb->lcd_putsxy(0,0,s); + local_rb->snprintf(s,32,"Samples Decoded: %d",file_info->current_sample); + local_rb->lcd_putsxy(0,20,s); + local_rb->snprintf(s,32,"Frames Decoded: %d",file_info->frames_decoded); + local_rb->lcd_putsxy(0,40,s); + + ticks_taken=*(local_rb->current_tick)-file_info->start_tick; + + /* e.g.: + ticks_taken=500 + sam_fmt.rate=44,100 + samples_decoded=172,400 + (samples_decoded/sam_fmt.rate)*100=400 (time it should have taken) + % Speed=(400/500)*100=80% + */ + + if (ticks_taken==0) { ticks_taken=1; } // Avoid fp exception. + + speed=(100*file_info->current_sample)/file_info->samplerate; + xspeed=(speed*10000)/ticks_taken; + local_rb->snprintf(s,32,"Speed %ld.%02ld %% Secs: %d",(xspeed/100),(xspeed%100),ticks_taken/100); + local_rb->lcd_putsxy(0,60,s); + + local_rb->lcd_update(); +} + +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) + 2,0, // 22 - NumChannels + 0,0,0,0, // 24 - SampleRate in Hz + 0,0,0,0, // 28 - Byte Rate (SampleRate*NumChannels*(BitsPerSample/8) + 4,0, // 32 - BlockAlign (== NumChannels * BitsPerSample/8) + 16,0, // 34 - BitsPerSample + 'd','a','t','a', // 36 - Subchunk2ID + 0,0,0,0 // 40 - Subchunk2Size + }; + + +int local_init(char* infilename, char* outfilename, file_info_struct* file_info, struct plugin_api* rb) { + char s[32]; + int i,n,bytesleft; + + local_rb=rb; + + mem_ptr=0; + mp3buf=local_rb->plugin_get_mp3_buffer(&bufsize); + mallocbuf=mp3buf; + filebuf=&mp3buf[MALLOC_BUFSIZE]; + + local_rb->snprintf(s,32,"mp3 bufsize: %d",bufsize); + local_rb->lcd_putsxy(0,100,s); + local_rb->lcd_update(); + + file_info->infile=local_rb->open(infilename,O_RDONLY); + file_info->outfile=local_rb->creat(outfilename,O_WRONLY); + local_rb->write(file_info->outfile,wav_header,sizeof(wav_header)); + file_info->curpos=0; + file_info->current_sample=0; + file_info->frames_decoded=0; + file_info->filesize=local_rb->filesize(file_info->infile); + + if (file_info->filesize > (bufsize-MALLOC_BUFSIZE)) { + local_rb->close(file_info->infile); + local_rb->splash(HZ*2, true, "File too large"); + return(1); + } + + local_rb->snprintf(s,32,"Loading file..."); + local_rb->lcd_putsxy(0,0,s); + local_rb->lcd_update(); + + bytesleft=file_info->filesize; + i=0; + while (bytesleft > 0) { + n=local_rb->read(file_info->infile,&filebuf[i],bytesleft); + if (n < 0) { + local_rb->close(file_info->infile); + local_rb->splash(HZ*2, true, "ERROR READING FILE"); + return(1); + } + i+=n; bytesleft-=n; + } + local_rb->close(file_info->infile); + return(0); +} + +void close_wav(file_info_struct* file_info) { + int x; + int filesize=local_rb->filesize(file_info->outfile); + + /* We assume 16-bit, Stereo */ + + local_rb->lseek(file_info->outfile,0,SEEK_SET); + + // ChunkSize + x=filesize-8; + wav_header[4]=(x&0xff); + wav_header[5]=(x&0xff00)>>8; + wav_header[6]=(x&0xff0000)>>16; + wav_header[7]=(x&0xff000000)>>24; + + // Samplerate + wav_header[24]=file_info->samplerate&0xff; + wav_header[25]=(file_info->samplerate&0xff00)>>8; + wav_header[26]=(file_info->samplerate&0xff0000)>>16; + wav_header[27]=(file_info->samplerate&0xff000000)>>24; + + // ByteRate + x=file_info->samplerate*4; + wav_header[28]=(x&0xff); + wav_header[29]=(x&0xff00)>>8; + wav_header[30]=(x&0xff0000)>>16; + wav_header[31]=(x&0xff000000)>>24; + + // Subchunk2Size + x=filesize-44; + wav_header[40]=(x&0xff); + wav_header[41]=(x&0xff00)>>8; + wav_header[42]=(x&0xff0000)>>16; + wav_header[43]=(x&0xff000000)>>24; + + local_rb->write(file_info->outfile,wav_header,sizeof(wav_header)); + local_rb->close(file_info->outfile); +} diff --git a/apps/plugins/lib/xxx2wav.h b/apps/plugins/lib/xxx2wav.h new file mode 100644 index 0000000000..27e293f797 --- /dev/null +++ b/apps/plugins/lib/xxx2wav.h @@ -0,0 +1,55 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2005 Dave Chapman + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +/* Various "helper functions" common to all the xxx2wav decoder plugins */ + +/* the main data structure of the program */ +typedef struct { + int infile; + int outfile; + off_t curpos; + off_t filesize; + int samplerate; + int channels; + int frames_decoded; + unsigned long total_samples; + unsigned long current_sample; + unsigned long start_tick; +} file_info_struct; + +#define MALLOC_BUFSIZE (512*1024) + +extern int mem_ptr; +extern int bufsize; +extern unsigned char* mp3buf; // The actual MP3 buffer from Rockbox +extern unsigned char* mallocbuf; // 512K from the start of MP3 buffer +extern unsigned char* filebuf; // The rest of the MP3 buffer + +void* malloc(size_t size); +void* calloc(size_t nmemb, size_t size); +void free(void* ptr); +void* realloc(void* ptr, size_t size); +void *memcpy(void *dest, const void *src, size_t n); +void *memset(void *s, int c, size_t n); +int memcmp(const void *s1, const void *s2, size_t n); +void* memmove(const void *s1, const void *s2, size_t n); + +void display_status(file_info_struct* file_info); +int local_init(char* infilename, char* outfilename, file_info_struct* file_info, struct plugin_api* rb); +void close_wav(file_info_struct* file_info); diff --git a/apps/plugins/mpa2wav.c b/apps/plugins/mpa2wav.c index 2f1f329275..a4fbf79605 100644 --- a/apps/plugins/mpa2wav.c +++ b/apps/plugins/mpa2wav.c @@ -24,11 +24,9 @@ #include -static struct plugin_api* rb; - -/* Helper functions common to all decoder test viewers (uses rb) */ +#include "lib/xxx2wav.h" /* Helper functions common to test decoders */ -#include "xxx2wav.h" +static struct plugin_api* rb; struct mad_stream Stream; struct mad_frame Frame; @@ -149,7 +147,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) /* This function sets up the buffers and reads the file into RAM */ - if (local_init(file,"/libmadtest.wav",&file_info)) { + if (local_init(file,"/libmadtest.wav",&file_info,api)) { return PLUGIN_ERROR; } diff --git a/apps/plugins/xxx2wav.h b/apps/plugins/xxx2wav.h deleted file mode 100644 index 1b93cf9d31..0000000000 --- a/apps/plugins/xxx2wav.h +++ /dev/null @@ -1,241 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2005 Dave Chapman - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* Various "helper functions" common to all the xxx2wav decoder plugins - - We include them as a .h because the plugin build system links - exactly one .c file with exactly one .rock file. - */ - - -/* the main data structure of the program */ -typedef struct { - int infile; - int outfile; - off_t curpos; - off_t filesize; - int samplerate; - int channels; - int frames_decoded; - unsigned long total_samples; - unsigned long current_sample; - unsigned long start_tick; -} file_info_struct; - -file_info_struct file_info; - -#define MALLOC_BUFSIZE (512*1024) - -int mem_ptr; -int bufsize; -unsigned char* mp3buf; // The actual MP3 buffer from Rockbox -unsigned char* mallocbuf; // 512K from the start of MP3 buffer -unsigned char* filebuf; // The rest of the MP3 buffer - -void* malloc(size_t size) { - void* x; - char s[32]; - - x=&mallocbuf[mem_ptr]; - mem_ptr+=size+(size%4); // Keep memory 32-bit aligned (if it was already?) - - rb->snprintf(s,30,"Memory used: %d",mem_ptr); - rb->lcd_putsxy(0,80,s); - rb->lcd_update(); - return(x); -} - -void* calloc(size_t nmemb, size_t size) { - void* x; - x=malloc(nmemb*size); - rb->memset(x,0,nmemb*size); - return(x); -} - -void free(void* ptr) { - (void)ptr; -} - -void* realloc(void* ptr, size_t size) { - void* x; - (void)ptr; - x=malloc(size); - return(x); -} - -void *memcpy(void *dest, const void *src, size_t n) { - return(rb->memcpy(dest,src,n)); -} - -void *memset(void *s, int c, size_t n) { - return(rb->memset(s,c,n)); -} - -int memcmp(const void *s1, const void *s2, size_t n) { - return(rb->memcmp(s1,s2,n)); -} - -void* memmove(const void *s1, const void *s2, size_t n) { - char* dest=(char*)s1; - char* src=(char*)s2; - size_t i; - - for (i=0;i0) { *(dest++)=*(src++); n--; } - return(dest); -} - -void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)) { - rb->qsort(base,nmemb,size,compar); -} - -void display_status(file_info_struct* file_info) { - char s[32]; - unsigned long ticks_taken; - unsigned long long speed; - unsigned long xspeed; - - rb->snprintf(s,32,"Bytes read: %d",file_info->curpos); - rb->lcd_putsxy(0,0,s); - rb->snprintf(s,32,"Samples Decoded: %d",file_info->current_sample); - rb->lcd_putsxy(0,20,s); - rb->snprintf(s,32,"Frames Decoded: %d",file_info->frames_decoded); - rb->lcd_putsxy(0,40,s); - - ticks_taken=*(rb->current_tick)-file_info->start_tick; - - /* e.g.: - ticks_taken=500 - sam_fmt.rate=44,100 - samples_decoded=172,400 - (samples_decoded/sam_fmt.rate)*100=400 (time it should have taken) - % Speed=(400/500)*100=80% - */ - - if (ticks_taken==0) { ticks_taken=1; } // Avoid fp exception. - - speed=(100*file_info->current_sample)/file_info->samplerate; - xspeed=(speed*10000)/ticks_taken; - rb->snprintf(s,32,"Speed %ld.%02ld %% Secs: %d",(xspeed/100),(xspeed%100),ticks_taken/100); - rb->lcd_putsxy(0,60,s); - - rb->lcd_update(); -} - -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) - 2,0, // 22 - NumChannels - 0,0,0,0, // 24 - SampleRate in Hz - 0,0,0,0, // 28 - Byte Rate (SampleRate*NumChannels*(BitsPerSample/8) - 4,0, // 32 - BlockAlign (== NumChannels * BitsPerSample/8) - 16,0, // 34 - BitsPerSample - 'd','a','t','a', // 36 - Subchunk2ID - 0,0,0,0 // 40 - Subchunk2Size - }; - - -int local_init(char* infilename, char* outfilename, file_info_struct* file_info) { - char s[32]; - int i,n,bytesleft; - - mem_ptr=0; - mp3buf=rb->plugin_get_mp3_buffer(&bufsize); - mallocbuf=mp3buf; - filebuf=&mp3buf[MALLOC_BUFSIZE]; - - rb->snprintf(s,32,"mp3 bufsize: %d",bufsize); - rb->lcd_putsxy(0,100,s); - rb->lcd_update(); - - file_info->infile=rb->open(infilename,O_RDONLY); - file_info->outfile=rb->creat(outfilename,O_WRONLY); - rb->write(file_info->outfile,wav_header,sizeof(wav_header)); - file_info->curpos=0; - file_info->current_sample=0; - file_info->frames_decoded=0; - file_info->filesize=rb->filesize(file_info->infile); - - if (file_info->filesize > (bufsize-MALLOC_BUFSIZE)) { - rb->close(file_info->infile); - rb->splash(HZ*2, true, "File too large"); - return(1); - } - - rb->snprintf(s,32,"Loading file..."); - rb->lcd_putsxy(0,0,s); - rb->lcd_update(); - - bytesleft=file_info->filesize; - i=0; - while (bytesleft > 0) { - n=rb->read(file_info->infile,&filebuf[i],bytesleft); - if (n < 0) { - rb->close(file_info->infile); - rb->splash(HZ*2, true, "ERROR READING FILE"); - return(1); - } - i+=n; bytesleft-=n; - } - rb->close(file_info->infile); - return(0); -} - -void close_wav(file_info_struct* file_info) { - int x; - int filesize=rb->filesize(file_info->outfile); - - /* We assume 16-bit, Stereo */ - - rb->lseek(file_info->outfile,0,SEEK_SET); - - // ChunkSize - x=filesize-8; - wav_header[4]=(x&0xff); - wav_header[5]=(x&0xff00)>>8; - wav_header[6]=(x&0xff0000)>>16; - wav_header[7]=(x&0xff000000)>>24; - - // Samplerate - wav_header[24]=file_info->samplerate&0xff; - wav_header[25]=(file_info->samplerate&0xff00)>>8; - wav_header[26]=(file_info->samplerate&0xff0000)>>16; - wav_header[27]=(file_info->samplerate&0xff000000)>>24; - - // ByteRate - x=file_info->samplerate*4; - wav_header[28]=(x&0xff); - wav_header[29]=(x&0xff00)>>8; - wav_header[30]=(x&0xff0000)>>16; - wav_header[31]=(x&0xff000000)>>24; - - // Subchunk2Size - x=filesize-44; - wav_header[40]=(x&0xff); - wav_header[41]=(x&0xff00)>>8; - wav_header[42]=(x&0xff0000)>>16; - wav_header[43]=(x&0xff000000)>>24; - - rb->write(file_info->outfile,wav_header,sizeof(wav_header)); - rb->close(file_info->outfile); -} - -- cgit v1.2.3