[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[247] mplayerxp

[<nic...@us...>]

Revision: 247
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=247&view=rev
Author:   nickols_k
Date:     2012-10-29 12:54:02 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
cleanups

Modified Paths:
--------------
    mplayerxp/mplayer.c
    mplayerxp/xmp_core.c
    mplayerxp/xmp_core.h

Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c	2012-10-29 12:47:00 UTC (rev 246)
+++ mplayerxp/mplayer.c	2012-10-29 12:54:02 UTC (rev 247)
@@ -114,7 +114,6 @@
 **************************************************************************/
 #include "xmp_core.h"
 
-volatile unsigned xp_drop_frame_cnt=0;
 float xp_screen_pts;
 
 ao_data_t* ao_data=NULL;
@@ -1502,7 +1501,7 @@
 	   100.0*tot/total_time_usage);
     unsigned nframes=xp_core.video->num_played_frames;
     MSG_INFO("\nREAL RESULTS: from %u was dropped=%u\n"
-	,nframes,xp_drop_frame_cnt);
+	,nframes,xp_core.video->num_dropped_frames);
     MSG_INFO("\nMax. A-V resync is: %f\n",fabs(priv->max_av_resync));
 }
 
@@ -1981,7 +1980,7 @@
     if(sh_video)	MSG_OK("Using DECODING AHEAD mplayer's core with %u video buffers\n",xp_core.num_v_buffs);
     else 		MSG_OK("Using DECODING AHEAD mplayer's core with %u audio buffers\n",xp_core.num_a_buffs);
 /* reset counters */
-    xp_drop_frame_cnt=0;
+    xp_core.video->num_dropped_frames=0;
 }
 
 static void mpxp_print_audio_status(void) {

Modified: mplayerxp/xmp_core.c
===================================================================
--- mplayerxp/xmp_core.c	2012-10-29 12:47:00 UTC (rev 246)
+++ mplayerxp/xmp_core.c	2012-10-29 12:54:02 UTC (rev 247)
@@ -176,26 +176,16 @@
 pthread_mutex_t audio_decode_mutex=PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t audio_decode_cond=PTHREAD_COND_INITIALIZER;
 
-extern volatile int xp_drop_frame;
-extern volatile unsigned xp_drop_frame_cnt;
-
 extern volatile float xp_screen_pts;
 volatile int dec_ahead_can_aseek=0;  /* It is safe to seek audio */
 volatile int dec_ahead_can_adseek=1;  /* It is safe to seek audio buffer thread */
 
-/* Support for '-loop' option */
-extern int loop_times; /* it's const for xp mode */
-
-extern float rel_seek_secs;	/* FIXME: in hope that user will not rewind */
-extern int sof_seek_pos;	/* the movie at end of file :( */
-
 extern int decore_audio( int xp_id );
-
 extern void update_osd( float v_pts );
 
 /* To let audio decoder thread sleep as long as player */
-struct timespec audio_play_timeout;
-int audio_play_in_sleep=0;
+static struct timespec audio_play_timeout;
+static int audio_play_in_sleep=0;
 
 extern int init_audio_buffer(int size, int min_reserv, int indices, sh_audio_t *sh_audio);
 extern void uninit_audio_buffer(void);
@@ -451,7 +441,7 @@
     if(mp_data->output_quality) {
 	if(drop_param) mpcv_set_quality(sh_video,mp_data->output_quality);
     }
-    if(!blit_frame && drop_param) xp_drop_frame_cnt++;
+    if(!blit_frame && drop_param) priv->dae->num_dropped_frames++;
     if(blit_frame) {
 	unsigned idx=dae_curr_vdecoded();
 	if(xp_is_bad_pts)

Modified: mplayerxp/xmp_core.h
===================================================================
--- mplayerxp/xmp_core.h	2012-10-29 12:47:00 UTC (rev 246)
+++ mplayerxp/xmp_core.h	2012-10-29 12:54:02 UTC (rev 247)
@@ -38,6 +38,7 @@
     unsigned		num_slow_frames;/* number of frames which were delayed due slow computer */
     long long int	num_played_frames;
     long long int	num_decoded_frames; /* for frame dropping */
+    long long int	num_dropped_frames;
 }dec_ahead_engine_t;
 
 #define MAX_MPXP_THREADS 16

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.