Changeset 6f3e4d56cb72a5f845bd28edea7104bdc6474b8a

Timestamp:

12/07/06 20:48:21 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1152730101 +0000

git-parent:

[c69f698af16d3398873d5cbd8ee520dc794408b4]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1152730101 +0000

Message:

RTSP rewind and fastforward support (Scale option). Almost entirely rewritten a patch from K. Staring <Qdk _at_ quickdekay dot net>.

Files:

• THANKS (modified) (1 diff)
• include/vlc_vod.h (modified) (1 diff)
• modules/misc/rtsp.c (modified) (4 diffs)
• src/misc/vlm.c (modified) (3 diffs)

THANKS

@@ -86 +86 @@
-kty0ne - WinAmp 5 skin for VLC
-Kevin H. Patterson <kevpatt at khptech dot com> - Theora framesize calculation patch by Kevin H. Patterson (kevpatt at khptech dot com
+K. Staring <qdk at quickdekay dot net> - RTSP rewind and fast-forward support
-Laurent Jonqueres <laurent_jonqueres at yahoo.fr> - Occitan localization
-Laurent Mutricy <laurent.mutricy at ecl2005 dot ec-lyon dot fr> - HTTP interface fixes

include/vlc_vod.h

@@ -64 +64 @@
-    VOD_MEDIA_STOP,         /* arg1= double         res=can fail    */
-    VOD_MEDIA_SEEK,         /* arg1= double *       res=    */
+    VOD_MEDIA_REWIND,       /* arg1= double *       res=    */
+    VOD_MEDIA_FORWARD,      /* arg1= double *       res=    */
-};
-

modules/misc/rtsp.c

@@ -786 +786 @@
-        case HTTPD_MSG_PLAY:
-        {
-*psz_position, 
+
-            int i, i_port_audio = 0, i_port_video = 0;
-
@@ -808 +808 @@
-            {
-                char *psz_position = httpd_MsgGet( query, "Range" );
+                char *psz_scale = httpd_MsgGet( query, "Scale" );
-                if( psz_position ) psz_position = strstr( psz_position, "npt=" );
-
+&& !psz_scale 
-                {
-                    double f_pos;
@@ -815 +816 @@
-
-                    msg_Dbg( p_vod, "seeking request: %s", psz_position );
-
-                    psz_position += 4;
-                    /* FIXME: npt= is not necessarily formatted as a float */
@@ -824 +824 @@
-                        vod_MediaControl( p_vod, p_media, psz_session,
-                                      VOD_MEDIA_SEEK, f_pos );
+                    }
+                    break;
+                }
+                if( psz_scale )
+                {
+                    double f_scale = 0.0;
+                    char *end;
+
+                    f_scale = us_strtod( psz_scale, &end );
+                    if( end > psz_scale )
+                    {
+                        f_scale = (f_scale * 30.0);
+                        if( psz_scale[0] == '-' ) /* rewind */
+                        {
+                            msg_Dbg( p_vod, "rewind request: %s", psz_scale );
+                            vod_MediaControl( p_vod, p_media, psz_session,
+                                                VOD_MEDIA_REWIND, f_scale );
+                        }
+                        else if(psz_scale[0] != '1' ) /* fast-forward */
+                        {
+                            msg_Dbg( p_vod, "fastforward request: %s", psz_scale );
+                            vod_MediaControl( p_vod, p_media, psz_session,
+                                                VOD_MEDIA_FORWARD, f_scale );
+                        }
+
+                        if( p_rtsp->b_paused == VLC_TRUE )
+                        {
+                            p_rtsp->b_paused = VLC_FALSE;
+                            vod_MediaControl( p_vod, p_media, psz_session,
+                                                VOD_MEDIA_PAUSE, psz_output );
+                        }
-                    }
-                    break;

src/misc/vlm.c

@@ -1277 +1277 @@
-        }
-    }
+    else if( !strcmp( psz_command, "rewind" ) )
+    {
+        float f_pos;
+        float f_scale;
+        vlc_value_t val;
+
+        if( psz_args )
+        {
+            f_scale = i18n_atof( psz_args );
+            f_pos = var_GetFloat( p_instance->p_input, "position" );
+            val.f_float = f_pos - (f_scale / 1000.0);
+            if( val.f_float < 0.0 )
+                val.f_float = 0.0;
+            var_Set( p_instance->p_input, "position", val );
+            return VLC_SUCCESS;
+        }
+    }
+    else if( !strcmp( psz_command, "forward" ) )
+    {
+        float f_pos;
+        float f_scale;
+        vlc_value_t val;
+
+        if( psz_args )
+        {
+            f_scale = i18n_atof( psz_args );
+            f_pos = var_GetFloat( p_instance->p_input, "position" );
+            val.f_float = f_pos + (f_scale / 1000.0);
+            if( val.f_float > 1.0 )
+                val.f_float = 1.0;
+            var_Set( p_instance->p_input, "position", val );
+            return VLC_SUCCESS;
+        }
+    }
-    else if( !strcmp( psz_command, "stop" ) )
-    {
@@ -2354 +2388 @@
-    }
-
+    case VOD_MEDIA_REWIND:
+    {
+        double f_scale = (double)va_arg( args, double );
+        char psz_scale[50];
+        lldiv_t div = lldiv( f_scale * 10000000, 10000000 );
+        sprintf( psz_scale, I64Fd".%07u", div.quot, (unsigned int) div.rem );
+        i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "rewind", psz_scale );
+        break;
+    }
+
+    case VOD_MEDIA_FORWARD:
+    {
+        double f_scale = (double)va_arg( args, double );
+        char psz_scale[50];
+        lldiv_t div = lldiv( f_scale * 10000000, 10000000 );
+        sprintf( psz_scale, I64Fd".%07u", div.quot, (unsigned int) div.rem );
+        i_ret = vlm_MediaControl( vlm, vlm->media[i], psz_id, "forward", psz_scale );
+        break;
+    }
+
-    default:
-        break;
@@ -2362 +2416 @@
-    return i_ret;
-}
+
-
-/*****************************************************************************