Implement access_GetParentInput and demux_GetParentInput and use.
[vlc.git] / src / input / stream_demux.c
index c73b2c9..69eac89 100644 (file)
@@ -32,7 +32,7 @@
 /****************************************************************************
  * stream_Demux*: create a demuxer for an outpout stream (allow demuxer chain)
  ****************************************************************************/
-typedef struct
+struct stream_sys_t
 {
     /* Data buffer */
     block_fifo_t *p_fifo;
@@ -45,7 +45,7 @@ typedef struct
     es_out_t    *out;
     demux_t     *p_demux;
 
-} d_stream_sys_t;
+};
 
 static int  DStreamRead   ( stream_t *, void *p_read, unsigned int i_read );
 static int  DStreamPeek   ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
@@ -54,28 +54,29 @@ static void DStreamDelete ( stream_t * );
 static void* DStreamThread ( vlc_object_t * );
 
 
-stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
-                             es_out_t *out )
+stream_t *stream_DemuxNew( demux_t *p_demux, const char *psz_demux, es_out_t *out )
 {
+    vlc_object_t *p_obj = VLC_OBJECT(p_demux);
     /* We create a stream reader, and launch a thread */
-    stream_t       *s;
-    d_stream_sys_t *p_sys;
+    stream_t     *s;
+    stream_sys_t *p_sys;
 
     s = stream_CommonNew( p_obj );
     if( s == NULL )
         return NULL;
+    s->p_input = p_demux->p_input;
+    s->psz_path  = strdup(""); /* N/A */
     s->pf_read   = DStreamRead;
     s->pf_peek   = DStreamPeek;
     s->pf_control= DStreamControl;
     s->pf_destroy= DStreamDelete;
 
-    s->p_sys = malloc( sizeof( d_stream_sys_t) );
-    if( s->p_sys == NULL )
+    s->p_sys = p_sys = malloc( sizeof( *p_sys) );
+    if( !s->psz_path || !s->p_sys )
     {
         stream_CommonDelete( s );
         return NULL;
     }
-    p_sys = (d_stream_sys_t*)s->p_sys;
 
     p_sys->i_pos = 0;
     p_sys->out = out;
@@ -93,7 +94,7 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
     }
 
     if( vlc_thread_create( s, "stream out", DStreamThread,
-                           VLC_THREAD_PRIORITY_INPUT, false ) )
+                           VLC_THREAD_PRIORITY_INPUT ) )
     {
         stream_CommonDelete( s );
         free( p_sys->psz_name );
@@ -106,13 +107,14 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
 
 void stream_DemuxSend( stream_t *s, block_t *p_block )
 {
-    d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
-    if( p_block ) block_FifoPut( p_sys->p_fifo, p_block );
+    stream_sys_t *p_sys = s->p_sys;
+    if( p_block )
+        block_FifoPut( p_sys->p_fifo, p_block );
 }
 
 static void DStreamDelete( stream_t *s )
 {
-    d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+    stream_sys_t *p_sys = s->p_sys;
     block_t *p_empty;
 
     vlc_object_kill( s );
@@ -122,8 +124,10 @@ static void DStreamDelete( stream_t *s )
     block_FifoPut( p_sys->p_fifo, p_empty );
     vlc_thread_join( s );
 
-    if( p_sys->p_demux ) demux_Delete( p_sys->p_demux );
-    if( p_sys->p_block ) block_Release( p_sys->p_block );
+    if( p_sys->p_demux )
+        demux_Delete( p_sys->p_demux );
+    if( p_sys->p_block )
+        block_Release( p_sys->p_block );
 
     block_FifoRelease( p_sys->p_fifo );
     free( p_sys->psz_name );
@@ -135,7 +139,7 @@ static void DStreamDelete( stream_t *s )
 
 static int DStreamRead( stream_t *s, void *p_read, unsigned int i_read )
 {
-    d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+    stream_sys_t *p_sys = s->p_sys;
     uint8_t *p_out = p_read;
     int i_out = 0;
 
@@ -176,7 +180,7 @@ static int DStreamRead( stream_t *s, void *p_read, unsigned int i_read )
 
 static int DStreamPeek( stream_t *s, const uint8_t **pp_peek, unsigned int i_peek )
 {
-    d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+    stream_sys_t *p_sys = s->p_sys;
     block_t **pp_block = &p_sys->p_block;
     int i_out = 0;
     *pp_peek = 0;
@@ -214,10 +218,9 @@ static int DStreamPeek( stream_t *s, const uint8_t **pp_peek, unsigned int i_pee
 
 static int DStreamControl( stream_t *s, int i_query, va_list args )
 {
-    d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+    stream_sys_t *p_sys = s->p_sys;
     int64_t    *p_i64;
     bool *p_b;
-    int        *p_int;
 
     switch( i_query )
     {
@@ -257,11 +260,6 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
             return VLC_SUCCESS;
         }
 
-        case STREAM_GET_MTU:
-            p_int = (int*) va_arg( args, int * );
-            *p_int = 0;
-            return VLC_SUCCESS;
-
         case STREAM_CONTROL_ACCESS:
         case STREAM_GET_CONTENT_TYPE:
         case STREAM_SET_RECORD_STATE:
@@ -276,17 +274,20 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
 static void* DStreamThread( vlc_object_t* p_this )
 {
     stream_t *s = (stream_t *)p_this;
-    d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+    stream_sys_t *p_sys = s->p_sys;
     demux_t *p_demux;
     int canc = vlc_savecancel();
 
     /* Create the demuxer */
-    if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out,
+    if( !(p_demux = demux_New( s, s->p_input, "", p_sys->psz_name, "", s, p_sys->out,
                                false )) )
     {
         return NULL;
     }
 
+    /* stream_Demux cannot apply DVB filters.
+     * Get all programs and let the E/S output sort them out. */
+    demux_Control( p_demux, DEMUX_SET_GROUP, -1, NULL );
     p_sys->p_demux = p_demux;
 
     /* Main loop */