Changeset 2feaca935ad991eba56614fa18373d7f9d0ec553

Timestamp:

12/12/04 01:04:04 (4 years ago)

Author:

Sigmund Augdal Helberg <sigmunau@videolan.org>

git-committer:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1102809844 +0000

git-parent:

[c2d4afc452c3f81b654661c53223b178f861ad12]

git-author:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1102809844 +0000

Message:

mpga.c: check/hack to make duration available after preparse

Files:

• modules/demux/mpeg/mpga.c (modified) (6 diffs)

modules/demux/mpeg/mpga.c

@@ -73 +73 @@
-    int i_xing_bitrate_avg;
-    int i_xing_frame_samples;
+    block_t *p_block_in, *p_block_out;
-};
-
@@ -115 +116 @@
-    demux_t     *p_demux = (demux_t*)p_this;
-    demux_sys_t *p_sys;
-
+ 
-
-    uint32_t     header;
@@ -121 +122 @@
-    module_t    *p_id3;
-    vlc_meta_t  *p_meta = NULL;
+    block_t     *p_block_in, *p_block_out;
-
-    if( p_demux->psz_path )
@@ -267 +269 @@
-    }
-
+    if( ( p_block_in = stream_Block( p_demux->s, MPGA_PACKET_SIZE ) ) == NULL )
+    {
+        return VLC_EGENERIC;
+    }
+    p_block_in->i_pts = p_block_in->i_dts = 1;
+    p_block_out = p_sys->p_packetizer->pf_packetize(
+        p_sys->p_packetizer, &p_block_in );
+    
+    p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+    p_sys->p_es = es_out_Add( p_demux->out,
+                              &p_sys->p_packetizer->fmt_out);
+    p_sys->i_bitrate_avg = p_sys->p_packetizer->fmt_out.i_bitrate;
+    
+    if( p_sys->i_xing_bytes && p_sys->i_xing_frames &&
+        p_sys->i_xing_frame_samples )
+    {
+        p_sys->i_bitrate_avg = p_sys->i_xing_bytes * I64C(8) *
+            p_sys->p_packetizer->fmt_out.audio.i_rate /
+            p_sys->i_xing_frames / p_sys->i_xing_frame_samples;
+    }
+
+    p_sys->p_block_in = p_block_in;
+    p_sys->p_block_out = p_block_out;
+
-    return VLC_SUCCESS;
-}
@@ -279 +305 @@
-    demux_sys_t *p_sys = p_demux->p_sys;
-    block_t *p_block_in, *p_block_out;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        while( p_block_out )
-        {
-            block_t *p_next = p_block_out->p_next;
-
-            if( p_sys->p_es == NULL )
-            {
-                p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
-                p_sys->p_es = es_out_Add( p_demux->out,
-                                          &p_sys->p_packetizer->fmt_out);
-
-                p_sys->i_bitrate_avg = p_sys->p_packetizer->fmt_out.i_bitrate;
-
-                if( p_sys->i_xing_bytes && p_sys->i_xing_frames &&
-                    p_sys->i_xing_frame_samples )
-                {
-                    p_sys->i_bitrate_avg = p_sys->i_xing_bytes * I64C(8) *
-                        p_sys->p_packetizer->fmt_out.audio.i_rate /
-                        p_sys->i_xing_frames / p_sys->i_xing_frame_samples;
-                }
-            }
-
-            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
@@ -320 +338 @@
-            p_block_out = p_next;
-        }
+        p_block_out = p_sys->p_packetizer->pf_packetize(
+            p_sys->p_packetizer, &p_block_in );
-    }
-    return 1;