[vlc-devel] commit: Revert "(live555) RTSP fastforward works from Qt4 interface." ( Christophe Mutricy )
git version control
git at videolan.org
Tue Nov 25 23:31:59 CET 2008
vlc | branch: 0.9-bugfix | Christophe Mutricy <xtophe at videolan.org> | Tue Nov 25 22:28:22 2008 +0000| [16dd19e618852c4ec8d85c34b78ca186c02d1659] | committer: Christophe Mutricy
Revert "(live555) RTSP fastforward works from Qt4 interface."
This reverts commit d57d4de31b836e1642a8676e199d2386ff2d644b.
New features that are not self-contained and modify src/ are not
welcomed in -bugfix branches without pre-existent consensus.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=16dd19e618852c4ec8d85c34b78ca186c02d1659
---
modules/demux/live555.cpp | 62 +++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 620725e..f986baf 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -40,7 +40,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_input.h>
+
#include <vlc_demux.h>
#include <vlc_interface.h>
#include <vlc_network.h>
@@ -1225,14 +1225,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_sys->i_npt_length > 0 )
{
- *pi64 = (int64_t)((double)p_sys->i_npt_length * 1000000.0);
+ *pi64 = p_sys->i_npt_length;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
case DEMUX_GET_POSITION:
pf = (double*)va_arg( args, double* );
- if( (p_sys->i_npt_length > 0) && (p_sys->i_npt > 0) )
+ if( p_sys->i_npt_length > 0 && p_sys->i_npt > 0)
{
*pf = ( (double)p_sys->i_npt / (double)p_sys->i_npt_length );
return VLC_SUCCESS;
@@ -1241,12 +1241,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_SET_POSITION:
case DEMUX_SET_TIME:
- if( p_sys->rtsp && (p_sys->i_npt_length > 0) )
+ if( p_sys->rtsp && p_sys->i_npt_length > 0 )
{
int i;
float time;
- if( (i_query == DEMUX_SET_TIME) && (p_sys->i_npt > 0) )
+ if( i_query == DEMUX_SET_TIME && p_sys->i_npt )
{
i64 = (int64_t)va_arg( args, int64_t );
time = (float)((double)i64 / (double)1000000.0); /* in second */
@@ -1313,69 +1313,55 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
#endif
return VLC_SUCCESS;
+#if 0
case DEMUX_CAN_CONTROL_RATE:
pb = (bool*)va_arg( args, bool * );
pb2 = (bool*)va_arg( args, bool * );
- *pb = (p_sys->rtsp != NULL) &&
- (p_sys->i_npt_length > 0) &&
- !var_GetBool( p_demux, "rtsp-kasenna" );
+ *pb = p_sys->rtsp != NULL && p_sys->i_npt_length > 0 && !var_GetBool( p_demux, "rtsp-kasenna" );
*pb2 = false;
return VLC_SUCCESS;
case DEMUX_SET_RATE:
{
- double f_scale, f_old_scale;
- int i;
+ double f_scale;
- if( !p_sys->rtsp || (p_sys->i_npt_length <= 0) ||
- var_GetBool( p_demux, "rtsp-kasenna" ) )
+ if( !p_sys->rtsp || p_sys->i_npt_length <= 0 || var_GetBool( p_demux, "rtsp-kasenna" ) )
return VLC_EGENERIC;
- /* According to RFC 2326 p56 chapter 12.35 a RTSP server that
- * supports Scale should:
- *
- * "The server should try to approximate the viewing rate, but may
- * restrict the range of scale values that it supports. The response
- * MUST contain the actual scale value chosen by the server."
- *
- * Scale = 1 indicates normal play
- * Scale > 1 indicates fast forward
- * Scale < 1 && Scale > 0 indicates slow motion
- * Scale < 0 value indicates rewind
+ /* 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 / (*pi_int);
- f_old_scale = p_sys->ms->scale();
+ 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 */
+ * 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;
}
-
- if( p_sys->ms->scale() == f_old_scale )
- {
- msg_Err( p_demux, "no scale change using old Scale %0.2f",
- p_sys->ms->scale() );
- return VLC_EGENERIC;
- }
-
/* ReSync the stream */
p_sys->i_npt_start = 0;
p_sys->i_pcr = 0;
- p_sys->i_npt = 0.0;
+ p_sys->i_npt = 0;
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
- *pi_int = (int)( INPUT_RATE_DEFAULT / p_sys->ms->scale() );
- msg_Dbg( p_demux, "PLAY with new Scale %0.2f (%d)", p_sys->ms->scale(), (*pi_int) );
+ *pi_int = (int)( INPUT_RATE_DEFAULT / p_sys->ms->scale() + 0.5 );
return VLC_SUCCESS;
}
+#endif
case DEMUX_SET_PAUSE_STATE:
{
More information about the vlc-devel
mailing list