forked from len0rd/rockbox
moved and renamed the codecs, gave the codecs a new extension (.codec),
unified to a single codec-only API, made a new codeclib, disabled the building of the *2wav plugins git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6812 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg
parent
b7aaa641b8
commit
1dd672fe32
29 changed files with 1709 additions and 937 deletions
|
|
@ -34,9 +34,8 @@ gray_verline.c
|
|||
#ifdef HAVE_LCD_CHARCELLS
|
||||
playergfx.c
|
||||
#endif
|
||||
#if 0
|
||||
#if CONFIG_HWCODEC == MASNONE /* software codec platforms */
|
||||
xxx2wav.c
|
||||
#ifdef IRIVER_H100
|
||||
codeclib.c
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,37 +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 */
|
||||
|
||||
#include "plugin.h"
|
||||
#include "playback.h"
|
||||
#include "codeclib.h"
|
||||
#include "xxx2wav.h"
|
||||
|
||||
struct plugin_api* local_rb;
|
||||
|
||||
int codec_init(struct plugin_api* rb, struct codec_api* ci) {
|
||||
local_rb = rb;
|
||||
|
||||
xxx2wav_set_api(rb);
|
||||
mem_ptr = 0;
|
||||
mallocbuf = (unsigned char *)ci->get_codec_memory((size_t *)&bufsize);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,46 +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 */
|
||||
|
||||
#if CONFIG_CPU == MCF5249 && !defined(SIMULATOR)
|
||||
#define ICODE_ATTR __attribute__ ((section(".icode")))
|
||||
#define IDATA_ATTR __attribute__ ((section(".idata")))
|
||||
#define USE_IRAM 1
|
||||
#else
|
||||
#define ICODE_ATTR
|
||||
#define IDATA_ATTR
|
||||
#endif
|
||||
|
||||
extern int mem_ptr;
|
||||
extern int bufsize;
|
||||
extern unsigned char* mallocbuf; // 512K from the start of MP3 buffer
|
||||
|
||||
void* codec_malloc(size_t size);
|
||||
void* codec_calloc(size_t nmemb, size_t size);
|
||||
void* codec_alloca(size_t size);
|
||||
void* codec_realloc(void* ptr, size_t size);
|
||||
void codec_free(void* ptr);
|
||||
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);
|
||||
|
||||
int codec_init(struct plugin_api* rb, struct codec_api* ci);
|
||||
|
||||
|
|
@ -1,259 +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 */
|
||||
|
||||
#if (CONFIG_HWCODEC == MASNONE)
|
||||
/* software codec platforms, not for simulator */
|
||||
|
||||
#include "plugin.h"
|
||||
#include "xxx2wav.h"
|
||||
|
||||
static struct plugin_api* local_rb;
|
||||
|
||||
int mem_ptr;
|
||||
int bufsize;
|
||||
unsigned char* audiobuf; // The actual audio buffer from Rockbox
|
||||
unsigned char* mallocbuf; // 512K from the start of audio buffer
|
||||
unsigned char* filebuf; // The rest of the audio buffer
|
||||
|
||||
void* codec_malloc(size_t size) {
|
||||
void* x;
|
||||
|
||||
x=&mallocbuf[mem_ptr];
|
||||
mem_ptr+=(size+3)&~3; // Keep memory 32-bit aligned (if it was already?)
|
||||
/*
|
||||
if(TIME_AFTER(*(local_rb->current_tick), last_tick + HZ)) {
|
||||
char s[32];
|
||||
static long last_tick = 0;
|
||||
local_rb->snprintf(s,30,"Memory used: %d",mem_ptr);
|
||||
local_rb->lcd_putsxy(0,80,s);
|
||||
|
||||
last_tick = *(local_rb->current_tick);
|
||||
local_rb->lcd_update();
|
||||
}*/
|
||||
return(x);
|
||||
}
|
||||
|
||||
void* codec_calloc(size_t nmemb, size_t size) {
|
||||
void* x;
|
||||
x = codec_malloc(nmemb*size);
|
||||
local_rb->memset(x,0,nmemb*size);
|
||||
return(x);
|
||||
}
|
||||
|
||||
void* codec_alloca(size_t size) {
|
||||
void* x;
|
||||
x = codec_malloc(size);
|
||||
return(x);
|
||||
}
|
||||
|
||||
void codec_free(void* ptr) {
|
||||
(void)ptr;
|
||||
}
|
||||
|
||||
void* codec_realloc(void* ptr, size_t size) {
|
||||
void* x;
|
||||
(void)ptr;
|
||||
x = codec_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* memchr(const void *s, int c, size_t n) {
|
||||
/* TO DO: Implement for Tremor */
|
||||
(void)s;
|
||||
(void)c;
|
||||
(void)n;
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
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;i<n;i++) { dest[i]=src[i]; }
|
||||
// while(n>0) { *(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;
|
||||
static long last_tick = 0;
|
||||
|
||||
if(TIME_AFTER(*(local_rb->current_tick), last_tick + HZ)) {
|
||||
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);
|
||||
|
||||
last_tick = *(local_rb->current_tick);
|
||||
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
|
||||
};
|
||||
|
||||
|
||||
void xxx2wav_set_api(struct plugin_api* rb)
|
||||
{
|
||||
local_rb = rb;
|
||||
}
|
||||
|
||||
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;
|
||||
audiobuf=local_rb->plugin_get_audio_buffer(&bufsize);
|
||||
mallocbuf=audiobuf;
|
||||
filebuf=&audiobuf[MALLOC_BUFSIZE];
|
||||
|
||||
local_rb->snprintf(s,32,"audio 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);
|
||||
|
||||
local_rb->splash(HZ, true, "in: %d, size: %d", file_info->infile, file_info->filesize);
|
||||
|
||||
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);
|
||||
local_rb->lcd_clear_display();
|
||||
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);
|
||||
}
|
||||
#endif /* CONFIG_HWCODEC == MASNONE */
|
||||
|
|
@ -1,67 +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 */
|
||||
|
||||
#if CONFIG_CPU == MCF5249 && !defined(SIMULATOR)
|
||||
#define ICODE_ATTR __attribute__ ((section(".icode")))
|
||||
#define IDATA_ATTR __attribute__ ((section(".idata")))
|
||||
#define USE_IRAM 1
|
||||
#else
|
||||
#define ICODE_ATTR
|
||||
#define IDATA_ATTR
|
||||
#endif
|
||||
|
||||
/* the main data structure of the program */
|
||||
typedef struct {
|
||||
int infile;
|
||||
int outfile;
|
||||
off_t curpos;
|
||||
off_t filesize;
|
||||
int samplerate;
|
||||
int bitspersample;
|
||||
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* codec_malloc(size_t size);
|
||||
void* codec_calloc(size_t nmemb, size_t size);
|
||||
void* codec_alloca(size_t size);
|
||||
void* codec_realloc(void* ptr, size_t size);
|
||||
void codec_free(void* ptr);
|
||||
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);
|
||||
void xxx2wav_set_api(struct plugin_api* rb);
|
||||
Loading…
Add table
Add a link
Reference in a new issue