forked from len0rd/rockbox
Merge mpeg_malloc_reason_t and mpeg2_alloc_t, add STATE_INTERNAL_NORETURN to mpeg2_state_t, to fix warnings with short enums.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23677 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
475e68851d
commit
e0b020fbfc
4 changed files with 12 additions and 15 deletions
|
@ -23,6 +23,8 @@
|
|||
#ifndef MPEGPLAYER_H
|
||||
#define MPEGPLAYER_H
|
||||
|
||||
#include "mpeg2.h"
|
||||
|
||||
#ifdef HAVE_SCHEDULER_BOOSTCTRL
|
||||
#define trigger_cpu_boost rb->trigger_cpu_boost
|
||||
#define cancel_cpu_boost rb->cancel_cpu_boost
|
||||
|
@ -32,17 +34,6 @@
|
|||
/* Memory allotments for various subsystems */
|
||||
#define MIN_MEMMARGIN (4*1024)
|
||||
|
||||
enum mpeg_malloc_reason_t
|
||||
{
|
||||
__MPEG_ALLOC_FIRST = -256,
|
||||
MPEG_ALLOC_CODEC_MALLOC,
|
||||
MPEG_ALLOC_CODEC_CALLOC,
|
||||
MPEG_ALLOC_MPEG2_BUFFER,
|
||||
MPEG_ALLOC_AUDIOBUF,
|
||||
MPEG_ALLOC_PCMOUT,
|
||||
MPEG_ALLOC_DISKBUF,
|
||||
};
|
||||
|
||||
/** Video thread **/
|
||||
#define LIBMPEG2_ALLOC_SIZE (2*1024*1024)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue