the long-awaited video_out changes, not completely debuged (races)

- pts are 64 bit now
- scr and video_out-loop run all the time
- video_out cleanups
- metronom cleanups
- buffer type BUF_CONTROL_DISCONTINUITY is used internally now,
  input plugins should no longer send this one
- support for individual frame durations
- using nano-/usleep instead of itimer (simpler code, maybe this will
  help freebsd)

CVS patchset: 1487
CVS date: 2002/02/09 07:13:22

1 files changed, 3 insertions, 20 deletions

diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 6c0f1db43..d14467557 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_decoder.c,v 1.71 2002/01/25 00:35:46 f1rmb Exp $
+ * $Id: video_decoder.c,v 1.72 2002/02/09 07:13:24 guenter Exp $
  *
  */
 
@@ -105,8 +105,8 @@ void *video_decoder_loop (void *this_gen) {
       this->spu_finished = 0;
 
       pthread_mutex_unlock (&this->finished_lock);
-
-      this->metronom->video_stream_start (this->metronom);
+ 
+      this->metronom->expect_video_discontinuity (this->metronom);
 
       break;
 
@@ -144,8 +144,6 @@ void *video_decoder_loop (void *this_gen) {
 
     case BUF_CONTROL_END:
 
-      this->metronom->video_stream_end (this->metronom);
-
       if (this->cur_video_decoder_plugin) {
 	this->cur_video_decoder_plugin->close (this->cur_video_decoder_plugin);
 	this->cur_video_decoder_plugin = NULL;
@@ -184,15 +182,8 @@ void *video_decoder_loop (void *this_gen) {
       break;
 
     case BUF_CONTROL_DISCONTINUITY:
-      printf ("video_decoder: BUF_CONTROL_DISCONTINUITY is deprecated\n");
-      break;
-
-    case BUF_CONTROL_AVSYNC_RESET:
       printf ("video_decoder: discontinuity ahead\n");
 
-      if (this->cur_video_decoder_plugin) 
-	this->cur_video_decoder_plugin->flush (this->cur_video_decoder_plugin);
-
       this->video_in_discontinuity = 1;
 
       this->metronom->expect_video_discontinuity (this->metronom);
@@ -200,14 +191,6 @@ void *video_decoder_loop (void *this_gen) {
       this->video_in_discontinuity = 0;
       break;
     
-    case BUF_VIDEO_FILL:
-      break;
-      
-    case BUF_CONTROL_FLUSH:
-      if (this->cur_video_decoder_plugin) 
-	this->cur_video_decoder_plugin->flush (this->cur_video_decoder_plugin);
-      break;
-
     case BUF_CONTROL_AUDIO_CHANNEL:
       {
 	xine_ui_event_t  ui_event;