summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-04-10 15:22:17 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-04-10 15:22:17 +0000
commit69588c39343bef017758a402f523293afcc35da1 (patch)
tree5d1b5f9e63832da19c4009bf7b17dad0b36f2df7
parent6689cb0f9bdc68320bfd5eee8d6ce630a6d898b3 (diff)
downloadrockbox-69588c39343bef017758a402f523293afcc35da1.tar.gz
rockbox-69588c39343bef017758a402f523293afcc35da1.zip
mpegplayer: do a little post commit cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13095 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 4fd9311a66..b39f318ec3 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -173,13 +173,6 @@ static int total_offset = 0;
/* Utility */
-#define FF_I_TYPE 1 // Intra
-#define FF_P_TYPE 2 // Predicted
-#define FF_B_TYPE 3 // Bi-dir predicted
-#define FF_S_TYPE 4 // S(GMC)-VOP MPEG4
-#define FF_SI_TYPE 5
-#define FF_SP_TYPE 6
-
/* Atomically add one long value to another - not core safe atm if ever needed */
static inline void locked_add_long(volatile long *value, long amount)
{
@@ -1315,7 +1308,6 @@ static void video_thread(void)
/* A new picture is available - see if we should draw it */
uint32_t period; /* Frame period in clock ticks */
int32_t offset; /* Tick adjustment to keep sync */
- int type; /* Frame type: I/P/B/D */
/* No limiting => no dropping so simply make sure skipping is off
in the decoder and the frame will be drawn */
@@ -1417,10 +1409,11 @@ static void video_thread(void)
dither_index = (dither_index + 1) & 7;
offset += time_dither[dither_index]*period >> 3;
- type = info->current_picture->flags & PIC_MASK_CODING_TYPE;
-
if (frame_drop_level > 1 || offset > CLOCK_RATE*167/1000)
{
+ /* Frame type: I/P/B/D */
+ int type = info->current_picture->flags & PIC_MASK_CODING_TYPE;
+
/* Things are running a bit late or all frames are being
dropped until a key frame */