Move FPS display out of video_out_rockbox.c and into mpegplayer.c. Also add frame-rate limiting and frame-skipping (skipping display only, not decoding) to try and achieve real-time playback. Frame-rate limiting and frame skipping (and FPS display) are enabled via options in a new menu and are currently all off by default.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10669 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 0 insertions, 25 deletions

diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c
index 258416fcdd..38a76a7747 100644
--- a/apps/plugins/mpegplayer/video_out_rockbox.c
+++ b/apps/plugins/mpegplayer/video_out_rockbox.c
@@ -30,9 +30,6 @@ extern struct plugin_api* rb;
 #include "mpeg2.h"
 #include "video_out.h"
 
-static int starttick = 0;
-static int lasttick = 0;
-
 #define CSUB_X 2
 #define CSUB_Y 2
 
@@ -191,10 +188,6 @@ static void yuv_bitmap_part(unsigned char * const src[3],
 
 void vo_draw_frame (uint8_t * const * buf)
 {
-    char str[80];
-    static int frame=0;
-    int ticks,fps;
-
 #ifdef SIMULATOR
     yuv_bitmap_part(buf,0,0,image_width,
                     output_x,output_y,output_width,output_height);
@@ -204,24 +197,6 @@ void vo_draw_frame (uint8_t * const * buf)
                     0,0,image_width,
                     output_x,output_y,output_width,output_height);
 #endif
-
-    if (starttick==0) {
-        starttick=*rb->current_tick-1; /* Avoid divby0 */
-        lasttick=starttick;
-    }
-
-    /* Calculate fps */
-    if (*rb->current_tick-lasttick>=2*HZ) {
-        ticks=(*rb->current_tick)-starttick;
-
-        fps=(frame*1000)/ticks;
-        rb->snprintf(str,sizeof(str),"%d.%d",(fps/10),fps%10);
-        rb->lcd_putsxy(0,0,str);
-        rb->lcd_update_rect(0,0,80,8);
-        
-        lasttick+=2*HZ;
-    }
-    frame++;
 }
 
 void vo_setup(unsigned int width, unsigned int height,