len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve upon my hackity hack from before by separating audio into two types: that which may be large and can be streamed and that which is small and cannot be streamed. While modifying types, allow codecs to split across the buffer wrap and dig out/move around the code that reads a codec off of the buffer to facilitate that simple sounding change.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15408 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2007-11-02 14:06:48 +00:00
parent 21f0552947
commit dcca586a9b
5 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

52
apps/codecs.c
View file

@ -38,6 +38,7 @@
#include "keyboard.h"
#include "mpeg.h"
#include "buffer.h"
#include "buffering.h"
#include "mp3_playback.h"
#include "playback.h"
#include "backlight.h"
@ -57,8 +58,7 @@
#if CONFIG_CODEC == SWCODEC
unsigned char codecbuf[CODEC_SIZE];
#endif
void *sim_codec_load_ram(char* codecptr, int size,
void* ptr2, int bufwrap, void **pd);
void *sim_codec_load_ram(char* codecptr, int size, void **pd);
void sim_codec_close(void *pd);
#else
#define sim_codec_close(x)
@ -171,23 +171,11 @@ void codec_get_full_path(char *path, const char *codec_root_fn)
codec_root_fn);
}
int codec_load_ram(char* codecptr, int size, void* ptr2, int bufwrap,
struct codec_api *api)
static int codec_load_ram(int size, struct codec_api *api)
{
struct codec_header *hdr;
int status;
#ifndef SIMULATOR
int copy_n;
if ((char *)&codecbuf[0] != codecptr) {
size = MIN(size, CODEC_SIZE);
copy_n = MIN(size, bufwrap);
memcpy(codecbuf, codecptr, copy_n);
if (size - copy_n > 0) {
memcpy(&codecbuf[copy_n], ptr2, size - copy_n);
}
api->discard_codec();
}
hdr = (struct codec_header *)codecbuf;
if (size <= (signed)sizeof(struct codec_header)
@ -206,14 +194,16 @@ int codec_load_ram(char* codecptr, int size, void* ptr2, int bufwrap,
#else /* SIMULATOR */
void *pd;
hdr = sim_codec_load_ram(codecptr, size, ptr2, bufwrap, &pd);
api->discard_codec();
hdr = sim_codec_load_ram(codecbuf, size, &pd);
if (pd == NULL)
return CODEC_ERROR;
if (hdr == NULL
|| hdr->magic != CODEC_MAGIC
#ifdef HAVE_RECORDING
&& hdr->magic != CODEC_ENC_MAGIC
#endif
|| hdr->target_id != TARGET_ID) {
sim_codec_close(pd);
return CODEC_ERROR;
@ -233,6 +223,32 @@ int codec_load_ram(char* codecptr, int size, void* ptr2, int bufwrap,
return status;
}
int codec_load_buf(unsigned int hid, int size, struct codec_api *api) {
int rc;
rc = bufread(hid, size, codecbuf);
if (rc < 0) {
if (rc == ERR_DATA_NOT_READY) {
buf_request_buffer_handle(hid);
} else {
logf("error loading codec");
return CODEC_ERROR;
}
do {
rc = bufread(hid, size, codecbuf);
} while (rc == ERR_DATA_NOT_READY);
}
if (rc < 0) {
logf("error loading codec");
return CODEC_ERROR;
}
if (rc < size) {
logf("codec ended %d early",size - rc);
return CODEC_ERROR;
}
api->discard_codec();
return codec_load_ram(size, api);
}
int codec_load_file(const char *plugin, struct codec_api *api)
{
char msgbuf[80];
@ -257,5 +273,5 @@ int codec_load_file(const char *plugin, struct codec_api *api)
return CODEC_ERROR;
}
return codec_load_ram(codecbuf, (size_t)rc, NULL, 0, api);
return codec_load_ram((size_t)rc, api);
}