devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Merge mpeg_malloc_reason_t and mpeg2_alloc_t, add STATE_INTERNAL_NORETURN to mpeg2_state_t, to fix warnings with short enums.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23677 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andrew Mahone 2009-11-20 11:58:11 +00:00
parent 475e68851d
commit e0b020fbfc
4 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/mpegplayer/decode.c
View file

@ -191,7 +191,7 @@ mpeg2_state_t mpeg2_parse (mpeg2dec_t * mpeg2dec)
state = mpeg2dec->action (mpeg2dec); state = mpeg2dec->action (mpeg2dec);
if ((int)state > (int)STATE_INTERNAL_NORETURN) if (state > STATE_INTERNAL_NORETURN)
return state; return state;
} }

10
apps/plugins/mpegplayer/mpeg2.h
View file

@ -130,6 +130,7 @@ typedef struct mpeg2_decoder_s mpeg2_decoder_t;
typedef enum typedef enum
{ {
STATE_INTERNAL_NORETURN = -1,
STATE_BUFFER = 0, STATE_BUFFER = 0,
STATE_SEQUENCE = 1, STATE_SEQUENCE = 1,
STATE_SEQUENCE_REPEATED = 2, STATE_SEQUENCE_REPEATED = 2,
@ -199,7 +200,14 @@ typedef enum
MPEG2_ALLOC_CHUNK = 1, MPEG2_ALLOC_CHUNK = 1,
MPEG2_ALLOC_YUV = 2, MPEG2_ALLOC_YUV = 2,
MPEG2_ALLOC_CONVERT_ID = 3, MPEG2_ALLOC_CONVERT_ID = 3,
MPEG2_ALLOC_CONVERTED = 4 MPEG2_ALLOC_CONVERTED = 4,
MPEG_ALLOC_CODEC_MALLOC,
MPEG_ALLOC_CODEC_CALLOC,
MPEG_ALLOC_MPEG2_BUFFER,
MPEG_ALLOC_AUDIOBUF,
MPEG_ALLOC_PCMOUT,
MPEG_ALLOC_DISKBUF,
__MPEG_ALLOC_FIRST = -256,
} mpeg2_alloc_t; } mpeg2_alloc_t;
void * mpeg2_malloc (unsigned size, mpeg2_alloc_t reason); void * mpeg2_malloc (unsigned size, mpeg2_alloc_t reason);

2
apps/plugins/mpegplayer/mpeg2_internal.h
View file

@ -29,8 +29,6 @@
#include "config.h" /* for Rockbox CPU_ #defines */ #include "config.h" /* for Rockbox CPU_ #defines */
#define STATE_INTERNAL_NORETURN ((mpeg2_state_t)-1)
/* macroblock modes */ /* macroblock modes */
#define MACROBLOCK_INTRA 1 #define MACROBLOCK_INTRA 1
#define MACROBLOCK_PATTERN 2 #define MACROBLOCK_PATTERN 2

13
apps/plugins/mpegplayer/mpegplayer.h
View file

@ -23,6 +23,8 @@
#ifndef MPEGPLAYER_H #ifndef MPEGPLAYER_H
#define MPEGPLAYER_H #define MPEGPLAYER_H
#include "mpeg2.h"
#ifdef HAVE_SCHEDULER_BOOSTCTRL #ifdef HAVE_SCHEDULER_BOOSTCTRL
#define trigger_cpu_boost rb->trigger_cpu_boost #define trigger_cpu_boost rb->trigger_cpu_boost
#define cancel_cpu_boost rb->cancel_cpu_boost #define cancel_cpu_boost rb->cancel_cpu_boost
@ -32,17 +34,6 @@
/* Memory allotments for various subsystems */ /* Memory allotments for various subsystems */
#define MIN_MEMMARGIN (4*1024) #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 **/ /** Video thread **/
#define LIBMPEG2_ALLOC_SIZE (2*1024*1024) #define LIBMPEG2_ALLOC_SIZE (2*1024*1024)