[vlc-devel] commit: Fix rate slower/faster in rewind mode. (Laurent Aimar )
git version control
git at videolan.org
Thu Nov 20 19:58:10 CET 2008
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Nov 20 19:21:22 2008 +0100| [4ad64a6000d86ac689be9bc0ba8248203c90ccb7] | committer: Laurent Aimar
Fix rate slower/faster in rewind mode.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ad64a6000d86ac689be9bc0ba8248203c90ccb7
---
modules/demux/live555.cpp | 2 --
src/input/input.c | 41 ++++++++++++++++++++++++++++++++---------
2 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index d03b776..fd84502 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -1371,8 +1371,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
p_sys->i_pcr = 0;
p_sys->i_npt = 0.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) );
return VLC_SUCCESS;
diff --git a/src/input/input.c b/src/input/input.c
index f89b723..50fdac8 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1716,10 +1716,13 @@ static bool Control( input_thread_t *p_input, int i_type,
case INPUT_CONTROL_SET_RATE_FASTER:
{
int i_rate;
+ int i_rate_sign;
+ /* Get rate and direction */
if( i_type == INPUT_CONTROL_SET_RATE )
{
- i_rate = val.i_int;
+ i_rate = abs( val.i_int );
+ i_rate_sign = val.i_int < 0 ? -1 : 1;
}
else
{
@@ -1733,12 +1736,14 @@ static bool Control( input_thread_t *p_input, int i_type,
int i_idx;
int i;
+ i_rate_sign = p_input->p->i_rate < 0 ? -1 : 1;
+
i_error = INT_MAX;
i_idx = -1;
for( i = 0; ppi_factor[i][0] != 0; i++ )
{
const int i_test_r = INPUT_RATE_DEFAULT * ppi_factor[i][0] / ppi_factor[i][1];
- const int i_test_e = abs(p_input->p->i_rate - i_test_r);
+ const int i_test_e = abs( abs( p_input->p->i_rate ) - i_test_r );
if( i_test_e < i_error )
{
i_idx = i;
@@ -1765,12 +1770,8 @@ static bool Control( input_thread_t *p_input, int i_type,
}
}
- if( i_rate < 0 && p_input->p->input.b_rescale_ts )
- {
- msg_Dbg( p_input, "cannot set negative rate" );
- i_rate = INPUT_RATE_MIN;
- }
- else if( i_rate > 0 && i_rate < INPUT_RATE_MIN )
+ /* Check rate bound */
+ if( i_rate < INPUT_RATE_MIN )
{
msg_Dbg( p_input, "cannot set rate faster" );
i_rate = INPUT_RATE_MIN;
@@ -1780,6 +1781,22 @@ static bool Control( input_thread_t *p_input, int i_type,
msg_Dbg( p_input, "cannot set rate slower" );
i_rate = INPUT_RATE_MAX;
}
+
+ /* Apply direction */
+ if( i_rate_sign < 0 )
+ {
+ if( p_input->p->input.b_rescale_ts )
+ {
+ msg_Dbg( p_input, "cannot set negative rate" );
+ i_rate = p_input->p->i_rate;
+ assert( i_rate > 0 );
+ }
+ else
+ {
+ i_rate *= i_rate_sign;
+ }
+ }
+
if( i_rate != INPUT_RATE_DEFAULT &&
( ( !p_input->p->b_can_rate_control && !p_input->p->input.b_rescale_ts ) ||
( p_input->p->p_sout && !p_input->p->b_out_pace_control ) ) )
@@ -1792,10 +1809,17 @@ static bool Control( input_thread_t *p_input, int i_type,
{
int i_ret;
if( p_input->p->input.p_access )
+ {
i_ret = VLC_EGENERIC;
+ }
else
+ {
+ if( !p_input->p->input.b_rescale_ts )
+ es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+
i_ret = demux_Control( p_input->p->input.p_demux,
DEMUX_SET_RATE, &i_rate );
+ }
if( i_ret )
{
msg_Warn( p_input, "ACCESS/DEMUX_SET_RATE failed" );
@@ -1812,7 +1836,6 @@ static bool Control( input_thread_t *p_input, int i_type,
p_input->p->i_rate = i_rate;
- /* FIXME do we need a RESET_PCR when !p_input->p->input.b_rescale_ts ? */
if( p_input->p->input.b_rescale_ts )
{
const int i_rate_source = (p_input->b_can_pace_control || p_input->p->b_can_rate_control ) ? i_rate : INPUT_RATE_DEFAULT;
More information about the vlc-devel
mailing list