Mercurial > mplayer.hg

changeset 26847:4f875ae5d538

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
author reimar
date Mon, 26 May 2008 18:46:13 +0000
parents d8fd07838415
children 0adef34e9289
files stream/cache2.c
diffstat 1 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/stream/cache2.c	Mon May 26 13:04:07 2008 +0000
+++ b/stream/cache2.c	Mon May 26 18:46:13 2008 +0000
@@ -63,6 +63,7 @@
   volatile double control_double_arg;
   volatile int control_res;
   volatile off_t control_new_pos;
+  volatile double stream_time_length;
 } cache_vars_t;
 
 static int min_fill=0;
@@ -198,9 +199,17 @@
 }
 
 static void cache_execute_control(cache_vars_t *s) {
+  static unsigned last;
+  if (GetTimerMS() - last > 99) {
+    double len;
+    if (s->stream->control(s->stream, STREAM_CTRL_GET_TIME_LENGTH, &len) == STREAM_OK)
+      s->stream_time_length = len;
+    else
+      s->stream_time_length = 0;
+    last = GetTimerMS();
+  }
   if (s->control == -1) return;
   switch (s->control) {
-    case STREAM_CTRL_GET_TIME_LENGTH:
     case STREAM_CTRL_GET_CURRENT_TIME:
     case STREAM_CTRL_SEEK_TO_TIME:
     case STREAM_CTRL_GET_ASPECT_RATIO:
@@ -432,7 +441,9 @@
     case STREAM_CTRL_GET_NUM_CHAPTERS:
     case STREAM_CTRL_GET_CURRENT_CHAPTER:
 // the core might call these every frame, they are too slow for this...
-//    case STREAM_CTRL_GET_TIME_LENGTH:
+    case STREAM_CTRL_GET_TIME_LENGTH:
+      *(double *)arg = s->stream_time_length;
+      return s->stream_time_length ? STREAM_OK : STREAM_UNSUPPORTED;
 //    case STREAM_CTRL_GET_CURRENT_TIME:
     case STREAM_CTRL_GET_ASPECT_RATIO:
     case STREAM_CTRL_GET_NUM_ANGLES: