forked from len0rd/rockbox
Namely, introduce buffer_get_buffer() and buffer_release_buffer(). buffer_get_buffer() aquires all available and grabs a lock, attempting to call buffer_alloc() or buffer_get_buffer() while this lock is locked will cause a panicf() (doesn't actually happen, but is for debugging purpose). buffer_release_buffer() unlocks that lock and can additionally increment the audiobuf buffer to make an allocation. Pass 0 to only unlock if buffer was used temporarily only. buffer_available() is a replacement function to query audiobuflen, i.e. what's left in the buffer. Buffer init is moved up in the init chain and handles ipodvideo64mb internally. Further changes happened to mp3data.c and talk.c as to not call the above API functions, but get the buffer from callers. The caller is the audio system which has the buffer lock while mp3data.c and talk mess with the buffer. mpeg.c now implements some buffer related functions of playback.h, especially audio_get_buffer(), allowing to reduce #ifdef hell a tiny bit. audiobuf and audiobufend are local to buffer.c now. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30308 a1c6a512-1295-4272-9138-f99709370657
203 lines
5.6 KiB
C
203 lines
5.6 KiB
C
/***************************************************************************
|
|
* __________ __ ___.
|
|
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
|
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
|
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
|
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
|
* \/ \/ \/ \/ \/
|
|
* $Id$
|
|
*
|
|
* Copyright (C) 2002 by Linus Nielsen Feltzing
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
****************************************************************************/
|
|
#include <stdio.h>
|
|
#include <stdint.h>
|
|
#include "system.h"
|
|
#include "buffer.h"
|
|
#include "panic.h"
|
|
#include "logf.h"
|
|
|
|
#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
|
|
#else
|
|
#endif
|
|
|
|
/* defined in linker script */
|
|
#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
|
|
#if defined(IPOD_VIDEO)
|
|
extern unsigned char *audiobufend_lds[];
|
|
unsigned char *audiobufend;
|
|
#else /* !IPOD_VIDEO */
|
|
extern unsigned char audiobufend[];
|
|
#endif
|
|
/* defined in linker script */
|
|
extern unsigned char audiobuffer[];
|
|
#else /* PLATFORM_HOSTED */
|
|
unsigned char audiobuffer[(MEMORYSIZE*1024-256)*1024];
|
|
unsigned char *audiobufend = audiobuffer + sizeof(audiobuffer);
|
|
extern unsigned char *audiobufend;
|
|
#endif
|
|
|
|
static unsigned char *audiobuf;
|
|
|
|
#ifdef BUFFER_ALLOC_DEBUG
|
|
static unsigned char *audiobuf_orig_start;
|
|
|
|
struct buffer_start_marker
|
|
{
|
|
unsigned int magic;
|
|
size_t buffer_size;
|
|
};
|
|
#define BUF_MAGIC 0xDEADD0D0
|
|
|
|
struct buffer_end_marker
|
|
{
|
|
unsigned int magic;
|
|
int last;
|
|
};
|
|
#endif /* BUFFER_ALLOC_DEBUG */
|
|
|
|
void buffer_init(void)
|
|
{
|
|
/* 32-bit aligned */
|
|
audiobuf = (void *)(((unsigned long)audiobuffer + 3) & ~3);
|
|
|
|
#if defined(IPOD_VIDEO)
|
|
audiobufend=(unsigned char *)audiobufend_lds;
|
|
if(MEMORYSIZE==64 && probed_ramsize!=64)
|
|
{
|
|
audiobufend -= (32<<20);
|
|
}
|
|
#endif
|
|
|
|
#ifdef BUFFER_ALLOC_DEBUG
|
|
audiobuf_orig_start = audiobuf;
|
|
#endif /* BUFFER_ALLOC_DEBUG */
|
|
}
|
|
|
|
/* protect concurrent access */
|
|
static volatile int lock;
|
|
|
|
/*
|
|
* Give the entire buffer, return the size in size.
|
|
* The caller needs to make sure audiobuf is not otherwise used
|
|
*
|
|
* Note that this does not modify the buffer position (buffer_release_buffer()
|
|
* does), so call this if you want to aquire temporary memory
|
|
**/
|
|
#define _ALIGN (sizeof(char*))
|
|
void *buffer_get_buffer(size_t *size)
|
|
{
|
|
if (lock)
|
|
panicf("concurrent audiobuf access");
|
|
lock = 1;
|
|
audiobuf = ALIGN_UP(audiobuf, sizeof(intptr_t));
|
|
*size = (audiobufend - audiobuf);
|
|
return audiobuf;
|
|
}
|
|
|
|
/*
|
|
* Release the buffer gotten with buffer_get_buffer
|
|
*
|
|
* size should have the amount of bytes (from the front) that caller keeps for
|
|
* its own, 0 if the entire buffer is to be released
|
|
*
|
|
* safe to be called with size=0 even if the buffer wasn't claimed before
|
|
**/
|
|
void buffer_release_buffer(size_t size)
|
|
{
|
|
audiobuf += size;
|
|
/* ensure alignment */
|
|
audiobuf = ALIGN_UP(audiobuf, sizeof(intptr_t));
|
|
lock = 0;
|
|
}
|
|
|
|
/*
|
|
* Query how much free space the buffer has */
|
|
size_t buffer_available(void)
|
|
{
|
|
return audiobufend - audiobuf;
|
|
}
|
|
|
|
void *buffer_alloc(size_t size)
|
|
{
|
|
if (lock) /* it's not save to call this here */
|
|
panicf("buffer_alloc(): exclusive buffer owner");
|
|
void *retval;
|
|
#ifdef BUFFER_ALLOC_DEBUG
|
|
struct buffer_start_marker *start;
|
|
struct buffer_end_marker *end;
|
|
#endif /* BUFFER_ALLOC_DEBUG */
|
|
|
|
/* 32-bit aligned */
|
|
size = (size + 3) & ~3;
|
|
|
|
/* Other code touches audiobuf. Make sure it stays aligned */
|
|
audiobuf = (void *)(((unsigned long)audiobuf + 3) & ~3);
|
|
|
|
retval = audiobuf;
|
|
|
|
#ifdef BUFFER_ALLOC_DEBUG
|
|
retval +=sizeof(struct buffer_start_marker);
|
|
if(size>0)
|
|
{
|
|
end=(struct buffer_end_marker*)(audiobuf - sizeof(struct buffer_end_marker));
|
|
if(end->magic == BUF_MAGIC)
|
|
{
|
|
end->last=0;
|
|
}
|
|
start=(struct buffer_start_marker*)audiobuf;
|
|
start->magic = BUF_MAGIC;
|
|
start->buffer_size = size;
|
|
end=(struct buffer_end_marker*)(audiobuf+sizeof(struct buffer_start_marker)+size);
|
|
end->magic = BUF_MAGIC;
|
|
end->last = 1;
|
|
|
|
audiobuf = ((unsigned char *)end) + sizeof(struct buffer_end_marker);
|
|
}
|
|
|
|
logf("Alloc %x %d",(unsigned int)retval,size);
|
|
#else /* !BUFFER_ALLOC_DEBUG */
|
|
audiobuf += size;
|
|
#endif /* BUFFER_ALLOC_DEBUG */
|
|
|
|
if (audiobuf > audiobufend) {
|
|
panicf("OOM: %d bytes", (int) size);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
#ifdef BUFFER_ALLOC_DEBUG
|
|
void buffer_alloc_check(char *name)
|
|
{
|
|
unsigned char *buf_ptr = audiobuf_orig_start;
|
|
struct buffer_start_marker *start;
|
|
struct buffer_end_marker *end;
|
|
|
|
|
|
while(buf_ptr < audiobuf)
|
|
{
|
|
start=(struct buffer_start_marker*)buf_ptr;
|
|
if(start->magic != BUF_MAGIC)
|
|
{
|
|
panicf("%s corrupted buffer %x start", name,(unsigned int)buf_ptr+sizeof(struct buffer_start_marker));
|
|
}
|
|
end=(struct buffer_end_marker*)(buf_ptr+sizeof(struct buffer_start_marker)+start->buffer_size);
|
|
if(end->magic != BUF_MAGIC)
|
|
{
|
|
panicf("%s corrupted %x end", name,(unsigned int)buf_ptr+sizeof(struct buffer_start_marker));
|
|
}
|
|
if(end->last)
|
|
break;
|
|
buf_ptr=((unsigned char *)end)+sizeof(struct buffer_end_marker);
|
|
}
|
|
}
|
|
#endif /* BUFFER_ALLOC_DEBUG */
|