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

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

Revision: 214
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=214&view=rev
Author:   nickols_k
Date:     2012-10-26 08:49:43 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
cleanups

Modified Paths:
--------------
    mplayerxp/dec_ahead.c
    mplayerxp/dump.c
    mplayerxp/libmpdemux/stheader.h
    mplayerxp/mplayer.c

Modified: mplayerxp/dec_ahead.c
===================================================================
--- mplayerxp/dec_ahead.c	2012-10-26 08:26:02 UTC (rev 213)
+++ mplayerxp/dec_ahead.c	2012-10-26 08:49:43 UTC (rev 214)
@@ -189,10 +189,6 @@
     unsigned rc=0;
     static float prev_delta=64;
     float delta,max_frame_delay;/* delay for decoding of top slow frame */
-    /*
-    ada_active_frame	   - abs frame num. which is being displayed
-    abs_dec_ahead_locked_frame - abs frame num. which is being decoded
-    */
     max_frame_delay = time_usage.max_video+time_usage.max_vout;
 
     /*
@@ -320,7 +316,6 @@
 	pinfo[_xp_id].current_module = "Post seek";
 	if(xp_is_bad_pts) mpeg_timer=HUGE;
 	xp_core.in_lseek=NoSeek;
-	MSG_T("\nDEC_AHEAD: reset counters to (%u %u) due lseek\n",dec_ahead_locked_frame,abs_dec_ahead_locked_frame);
 	pinfo[_xp_id].current_module = "dec_ahead 3";
     }
     if(in_size<0) {
@@ -370,8 +365,6 @@
     if(xp_n_frame_to_drop)	drop_param=frame_dropping;
     else			drop_param=0;
     /* decode: */
-    MSG_T("\nDEC_AHEAD: decode to %u (abs (blitted(%u)>=active+xp-2(%u)))\n"
-		,abs_dec_ahead_blitted_frame,abs_dec_ahead_locked_frame,lda_active_frame+xp_num_frames-2);
     if(output_quality) {
 	unsigned total = xp_num_frames/2;
 	unsigned distance = dae_get_decoder_outrun(xp_core.video);
@@ -386,12 +379,6 @@
 	if(drop_param) mpcv_set_quality(sh_video,output_quality);
     }
     if(!blit_frame && drop_param) xp_drop_frame_cnt++;
-#ifdef ENABLE_DEC_AHEAD_DEBUG
-    if(verbose) {
-	MSG_T("\nDEC_AHEAD: frame %u decoded (blit=%u blit_param=%u size=%i)\n"
-	,abs_dec_ahead_locked_frame,blit_frame,drop_param,in_size);
-    }
-#endif
     if(blit_frame) {
 	unsigned idx=dae_curr_vdecoded();
 	if(xp_is_bad_pts)

Modified: mplayerxp/dump.c
===================================================================
--- mplayerxp/dump.c	2012-10-26 08:26:02 UTC (rev 213)
+++ mplayerxp/dump.c	2012-10-26 08:49:43 UTC (rev 214)
@@ -242,9 +242,14 @@
     if(priv) {
 	MSG_DBG2("Closing dump: %X %f secs\n"
 	     "As video %X-%ix%i audio %X-%ix%ix%i\n"
-	,demuxer,shv?shv->timer:sha->timer
-	,m_video?m_video->bih->biCompression:-1,m_video?m_video->bih->biWidth:-1,m_video?m_video->bih->biHeight:-1
-	,m_audio?m_audio->wf->wFormatTag:-1,m_audio?m_audio->wf->nSamplesPerSec:-1,m_audio?m_audio->wf->wBitsPerSample:-1,m_audio?m_audio->wf->nChannels:-1);
+	,demuxer,shv?priv->vtimer:sha->timer
+	,priv->m_video?priv->m_video->bih->biCompression:-1
+	,priv->m_video?priv->m_video->bih->biWidth:-1
+	,priv->m_video?priv->m_video->bih->biHeight:-1
+	,priv->m_audio?priv->m_audio->wf->wFormatTag:-1
+	,priv->m_audio?priv->m_audio->wf->nSamplesPerSec:-1
+	,priv->m_audio?priv->m_audio->wf->wBitsPerSample:-1
+	,priv->m_audio?priv->m_audio->wf->nChannels:-1);
 	if(shv && (priv->mux_type&MUX_HAVE_VIDEO)) priv->m_video->source=shv;
 	if(sha && (priv->mux_type&MUX_HAVE_AUDIO)) priv->m_audio->source=sha;
 	muxer_write_index(priv->muxer);

Modified: mplayerxp/libmpdemux/stheader.h
===================================================================
--- mplayerxp/libmpdemux/stheader.h	2012-10-26 08:26:02 UTC (rev 213)
+++ mplayerxp/libmpdemux/stheader.h	2012-10-26 08:49:43 UTC (rev 214)
@@ -12,16 +12,17 @@
 typedef struct sh_audio_s {
     int			aid;
     demux_stream_t*	ds;
-    unsigned int	format;
     struct codecs_st*	codec;
     int			inited;
+// input format
+    unsigned int	format;
+    unsigned		i_bps; // == bitrate  (compressed bytes/sec)
 // output format:
     float		timer;  // value of old a_frame
     unsigned		samplerate;
     unsigned		samplesize;
     unsigned		channels;
     unsigned		o_bps; // == samplerate*samplesize*channels   (uncompr. bytes/sec)
-    unsigned		i_bps; // == bitrate  (compressed bytes/sec)
 // in buffers:
     char*		a_in_buffer;
     int			a_in_buffer_len;
@@ -59,9 +60,10 @@
 typedef struct sh_video_s {
     int			vid;
     demux_stream_t*	ds;
-    unsigned int	format;
     struct codecs_st*	codec;
     int			inited;
+// input format
+    unsigned int	format;
     int			is_static; /* default: 0 - means movie; 1 - means picture (.jpg ...)*/
 // output format:
     float		fps;

Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c	2012-10-26 08:26:02 UTC (rev 213)
+++ mplayerxp/mplayer.c	2012-10-26 08:49:43 UTC (rev 214)
@@ -1118,7 +1118,7 @@
 	  osd_show_framedrop--;
       } else
 #ifdef ENABLE_DEC_AHEAD_DEBUG
-	  if(mp_conf.verbose) sprintf(osd_text_tmp,"%c %02d:%02d:%02d abs frame: %u",osd_function,pts/3600,(pts/60)%60,pts%60,abs_dec_ahead_active_frame);
+	  if(mp_conf.verbose) sprintf(osd_text_tmp,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60);
 	  else sprintf(osd_text_tmp,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60);
 #else
           sprintf(osd_text_tmp,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60);

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