Changeset 09cffd8327bd7a6b6809f14e999df7732b2a875a for modules/stream_out/bridge.c

Timestamp:

04/09/08 15:49:03 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1220536143 +0200

git-parent:

[dfa6af95dd38071980576b6ab24c1027b6729bf5]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1220536143 +0200

Message:

Fix placeholder mode. UDP streaming now works.

Make sure that we don't add the briged elementary streams to the next
stream output chain element when in placeholder mode. Maybe I should
split normal bridge-in and placeholder mode because the code is
begining to be filled with quite a few if( p_sys->b_placeholder ).

Files:

• modules/stream_out/bridge.c (modified) (6 diffs)

modules/stream_out/bridge.c

@@ -602 +602 @@
-
-                p_bridge->pp_es[i]->fmt.i_id += p_sys->i_id_offset;
-
-
-
+
-                {
-
-
+
+
+
+
+
+
+
-                }
-                msg_Dbg( p_stream, "bridging in input codec=%4.4s id=%d pos=%d",
@@ -624 +627 @@
-                  && p_bridge->pp_es[i]->i_last < i_date )
-            {
-
+
+
+
-                p_bridge->pp_es[i]->fmt.i_id -= p_sys->i_id_offset;
-                p_bridge->pp_es[i]->b_changed = true;
@@ -632 +637 @@
-        }
-
-
+|| p_sys->b_placeholder
-        {
-            block_t *p_block = p_bridge->pp_es[i]->p_block;
@@ -650 +655 @@
-                        p_sys->i_last_video = i_date;
-                        newid = p_sys->id_video;
+                        if( !newid )
+                            break;
-                        if( !p_sys->b_switch_on_iframe ||
-                            p_sys->i_state == placeholder_off ||
@@ -656 +663 @@
-                        {
-                            p_sys->p_out->pf_send( p_sys->p_out,
-?newid:p_bridge->pp_es[i]->id
+
-                                       p_bridge->pp_es[i]->p_block );
-                            p_sys->i_state = placeholder_off;
@@ -663 +670 @@
-                    case AUDIO_ES:
-                        newid = p_sys->id_audio;
+                        if( !newid )
+                            break;
-                        p_sys->i_last_audio = i_date;
-                    default: