[vlc-devel] commit: RTP: use --demux instead of --rtp-ts-demux ( Rémi Denis -Courmont )

[Marian Ďurkovič]

On Thu, Sep 25, 2008 at 10:41:33AM +0200, Rémi Denis-Courmont wrote:
> I disagree here. This changes the general semantics of the --demux
> parameter, which is much worse than changing (i.e. breaking) the semantic
> of --demux _only_ for rtp://.
> 
> In any case, the demux specification cannot be preserved for rtp://
> (without huge ugly hacks in demux_New) - even if we did support --demux, we
> still could not handle rtp/ts:// or rtp/demuxdump:// , and we still miss
> access_filter'ing.

Most your concerns are solved by the attached patches. They move demux
processing down the chain - i.e. to the access_demux module.
The patches assume your changes are already reverted.
This way we could also add demuxdump support for live555.




diff --git a/modules/demux/rtp.c b/modules/demux/rtp.c
index 1d819b4..df802b2 100644
--- a/modules/demux/rtp.c
+++ b/modules/demux/rtp.c
@@ -609,7 +609,7 @@ static void mpv_decode (demux_t *demux, void *data,
block_t
  */
 static void *ts_init (demux_t *demux)
 {
-    return stream_init (demux, "ts");
+    return stream_init (demux, *demux->psz_demux ? demux->psz_demux : "ts");
 }



diff --git a/src/input/input.c b/src/input/input.c
index bbccf7e..1bab7b1 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2121,12 +2121,8 @@ static int InputSourceInit( input_thread_t *p_input,
             }
         }

-        /* Try access_demux if no demux given */
-        if( *psz_demux == '\0' )
-        {
-            in->p_demux = demux_New( p_input, psz_access, psz_demux,
psz_path,
+        in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path,
                                       NULL, p_input->p->p_es_out, false );
-        }
     }
     else
     {