Changeset 328b47a8955037be12efcac4d063af6c67875df8

Timestamp:

11/12/07 22:12:25 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1197407545 +0000

git-parent:

[2e313885abf8c8487421a2215b0c61c170f23317]

git-author:

Laurent Aimar <fenrir@videolan.org> 1197407545 +0000

Message:

Added DEMUX_CAN_CONTROL_RATE and DEMUX_SET_RATE implementation based
on Glen Gray patch.
(The code is commented until it is confirmed to compil/work.)

Files:

• modules/demux/live555.cpp (modified) (2 diffs)

modules/demux/live555.cpp

@@ -1153 +1153 @@
-    int64_t *pi64;
-    double  *pf, f;
-
+
+
-
-    switch( i_query )
@@ -1260 +1261 @@
-#endif
-            return VLC_SUCCESS;
+
+#if 0
+        case DEMUX_CAN_CONTROL_RATE:
+            pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
+            pb2 = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
+
+            *pb = p_sys->rtsp != NULL && p_sys->i_npt_length > 0 && !var_GetBool( p_demux, "rtsp-kasenna" );
+            *pb2 = VLC_FALSE;
+            return VLC_SUCCESS;
+
+        case DEMUX_SET_RATE:
+        {
+            double f_scale;
+
+            if( !p_sys->rtsp || p_sys->i_npt_length <= 0 || var_GetBool( p_demux, "rtsp-kasenna" ) )
+                return VLC_EGENERIC;
+
+            /* TODO we might want to ensure that the new rate is different from
+             * old rate after playMediaSession...
+             * I have no idea how the server map the requested rate to the
+             * ones it supports.
+             * ex:
+             *  current is x2 we request x1.5 if the server return x2 we will
+             *  never succeed to return to x1.
+             *  In this case we should retry with a lower rate until we have
+             *  one (even x1).
+             */
+
+            pi_int = (int*)va_arg( args, int * );
+            f_scale = (double)INPUT_RATE_DEFAULT / (*p_int);
+
+            /* Passing -1 for the start and end time will mean liveMedia won't
+            * create a Range: section for the RTSP message. The server should
+            * pick up from the current position */
+            if( !p_sys->rtsp->playMediaSession( *p_sys->ms, -1, -1, f_scale ) )
+            {
+                msg_Err( p_demux, "PLAY with Scale %0.2f failed %s", f_scale,
+                        p_sys->env->getResultMsg() );
+                return VLC_EGENERIC;
+            }
+            /* ReSync the stream */
+            p_sys->i_npt_start = 0;
+            p_sys->i_pcr = 0;
+            es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+
+            *pi_int = (int)( INPUT_RATE_DEFAULT / p_sys->ms->scale() + 0.5 );
+            return VLC_SUCCESS;
+        }
+#endif
-
-        case DEMUX_SET_PAUSE_STATE: