Changeset e3a434cf108e28c395105b3425fe75e94be74b44

Timestamp:

08/02/05 18:02:49 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[236ca7aea13a438f92c245565208c9bb6ff9e11c]

git-author:

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

Message:

• all: better support for MBR mms stream (display only received streams).
  

Files:

• include/vlc_access.h (modified) (1 diff)
• modules/access/mms/mmsh.c (modified) (2 diffs)
• modules/access/mms/mmstu.c (modified) (3 diffs)
• modules/demux/asf/asf.c (modified) (2 diffs)
• src/input/stream.c (modified) (1 diff)

include/vlc_access.h

@@ -57 +57 @@
-    ACCESS_SET_PRIVATE_ID_STATE,    /* arg1= int i_private_data, vlc_bool_t b_selected can fail */
-    ACCESS_SET_PRIVATE_ID_CA,    /* arg1= int i_program_number, uint16_t i_vpid, uint16_t i_apid1, uint16_t i_apid2, uint16_t i_apid3, uint8_t i_length, uint8_t *p_data */
+    ACCESS_GET_PRIVATE_ID_STATE,    /* arg1=int i_private_data arg2=vlc_bool_t *  res=can fail */
-};
-

modules/access/mms/mmsh.c

@@ -168 +168 @@
-    int          *pi_int;
-    int64_t      *pi_64;
+    int          i_int;
-
-    switch( i_query )
@@ -192 +193 @@
-            pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * I64C(1000);
+            break;
+
+        case ACCESS_GET_PRIVATE_ID_STATE:
+            i_int = (int)va_arg( args, int );
+            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t );
+
+            if( i_int < 0 || i_int > 127 )
+                return VLC_EGENERIC;
+            *pb_bool =  p_sys->asfh.stream[i_int].i_selected ? VLC_TRUE : VLC_FALSE;
-            break;
-

modules/access/mms/mmstu.c

@@ -250 +250 @@
-    int          *pi_int;
-    int64_t      *pi_64;
+    int           i_int;
-    vlc_value_t  val;
-
@@ -278 +279 @@
-            break;
-
+        case ACCESS_GET_PRIVATE_ID_STATE:
+            i_int = (int)va_arg( args, int );
+            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t );
+
+            if( i_int < 0 || i_int > 127 )
+                return VLC_EGENERIC;
+            *pb_bool =  p_sys->asfh.stream[i_int].i_selected ? VLC_TRUE : VLC_FALSE;
+            break;
+
-        /* */
-        case ACCESS_SET_PAUSE_STATE:
@@ -285 +295 @@
-        case ACCESS_SET_PRIVATE_ID_STATE:
-            return VLC_EGENERIC;
+
-
-        default:

modules/demux/asf/asf.c

@@ -638 +638 @@
-        asf_track_t    *tk;
-        asf_object_stream_properties_t *p_sp;
+        vlc_bool_t b_access_selected;
-
-        p_sp = ASF_FindObject( p_sys->p_root->p_hdr,
@@ -650 +651 @@
-        tk->p_es = NULL;
-        tk->p_frame = NULL;
+
+        /* Check (in case of mms) if this track is selected (ie will receive data) */
+        if( !stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_GET_PRIVATE_ID_STATE,
+                             p_sp->i_stream_number, &b_access_selected ) &&
+            !b_access_selected )
+        {
+            tk->i_cat = UNKNOWN_ES;
+            msg_Dbg( p_demux, "ignoring not selected stream(ID:%d) (by access)",
+                     p_sp->i_stream_number );
+            continue;
+        }
-
-        if( ASF_CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_audio ) &&

src/input/stream.c

@@ -504 +504 @@
-        case STREAM_CONTROL_ACCESS:
-            i_int = (int) va_arg( args, int );
-
-
+
+
+
-            {
-                msg_Err( s, "Hey, what are you thinking ?"