Changeset 069f260a8179fa8f3462c121c6ff790300d321b0

Timestamp:

22/08/08 17:57:59 (3 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1219420679 +0200

git-parent:

[b1cea0a301d6bc450edc0b8ec03c4af54f5d9e35]

git-author:

Laurent Aimar <fenrir@videolan.org> 1219420679 +0200

Message:

Fixed input slave reading of a52/dts/flac/m4a/mpga (close #1818).

Input slave method needs that PCR of master and slave input use the same origin.

Files:

• modules/demux/a52.c (modified) (6 diffs)
• modules/demux/dts.c (modified) (4 diffs)
• modules/demux/flac.c (modified) (2 diffs)
• modules/demux/mpeg/m4a.c (modified) (2 diffs)
• modules/demux/mpeg/mpga.c (modified) (2 diffs)

modules/demux/a52.c

@@ -67 +67 @@
-    decoder_t *p_packetizer;
-
+    mtime_t i_pts;
+    mtime_t i_time_offset;
+
-    int i_mux_rate;
-    bool b_big_endian;
@@ -74 +77 @@
-
-#define PCM_FRAME_SIZE (1536 * 4)
-
+
+
-#define A52_PROBE_SIZE (512*1024)
-#define A52_MAX_HEADER_SIZE 10
@@ -110 +114 @@
-        /* Some A52 wav files don't begin with a sync code so we do a more
-         * extensive search */
-ACKET
+EEK
-        i_size -= (PCM_FRAME_SIZE + A52_MAX_HEADER_SIZE);
-
@@ -151 +155 @@
-    p_sys->i_mux_rate = 0;
-    p_sys->b_big_endian = b_big_endian;
+    p_sys->i_pts = 0;
+    p_sys->i_time_offset = 0;
-
-    /* Load the A52 packetizer */
@@ -234 +240 @@
-                    p_block_out->i_buffer * INT64_C(1000000)/p_block_out->i_length;
-            }
+            p_sys->i_pts = p_block_out->i_pts;
+
+            /* Correct timestamp */
+            p_block_out->i_pts += p_sys->i_time_offset;
+            p_block_out->i_dts += p_sys->i_time_offset;
-
-            /* set PCR */
@@ -253 +264 @@
-{
-    demux_sys_t *p_sys  = p_demux->p_sys;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        *pb_bool = true;
-        return VLC_SUCCESS;
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                       0, -1,
-                                       8*p_sys->i_mux_rate, 1, i_query, args );
+        if( !i_ret && p_sys->i_mux_rate > 0 &&
+            ( i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME ) )
+        {
+
+            const int64_t i_time = INT64_C(1000000) * stream_Tell(p_demux->s) /
+                                        p_sys->i_mux_rate;
+
+            /* Fix time_offset */
+            if( i_time >= 0 )
+                p_sys->i_time_offset = i_time - p_sys->i_pts;
+        }
+        return i_ret;
-    }
-}

modules/demux/dts.c

@@ -63 +63 @@
-    decoder_t *p_packetizer;
-
+    mtime_t i_pts;
+    mtime_t i_time_offset;
+
-    int i_mux_rate;
-};
@@ -157 +160 @@
-
-    DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
+    p_sys->i_mux_rate = 0;
+    p_sys->i_pts = 0;
+    p_sys->i_time_offset = 0;
- 
-    INIT_APACKETIZER( p_sys->p_packetizer, 'd','t','s',' ' );
@@ -215 +221 @@
-            }
-
+            /* Correct timestamp */
+            p_block_out->i_pts += p_sys->i_time_offset;
+            p_block_out->i_dts += p_sys->i_time_offset;
+
-            /* set PCR */
-            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
@@ -233 +243 @@
-{
-    demux_sys_t *p_sys  = p_demux->p_sys;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                       0, -1,
-                                       8*p_sys->i_mux_rate, 1, i_query, args );
+        if( !i_ret && p_sys->i_mux_rate > 0 &&
+            ( i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME ) )
+        {
+
+            const int64_t i_time = INT64_C(1000000) * stream_Tell(p_demux->s) /
+                                        p_sys->i_mux_rate;
+
+            /* Fix time_offset */
+            if( i_time >= 0 )
+                p_sys->i_time_offset = i_time - p_sys->i_pts;
+        }
+        return i_ret;
+    }
-}
-

modules/demux/flac.c

@@ -231 +231 @@
-            }
-
+            p_sys->i_pts = p_block_out->i_dts;
+
+            /* Correct timestamp */
+            p_block_out->i_pts += p_sys->i_time_offset;
+            p_block_out->i_dts += p_sys->i_time_offset;
+
-            /* set PCR */
-
++ p_sys->i_time_offset 
-                es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
-            else
-                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
-
-            p_sys->i_pts = p_block_out->i_dts;
-            es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
-
@@ -310 +315 @@
-        p_sys->i_time_offset = p_sys->seekpoint[i]->i_time_offset - p_sys->i_pts;
-        p_sys->i_pts_start = p_sys->i_pts+i_delta_time;
-
++ p_sys->i_time_offset 
-    }
-    else

modules/demux/mpeg/m4a.c

@@ -161 +161 @@
-            }
-
-            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
-
-            p_block_out->p_next = NULL;
-
-            p_sys->i_pts = p_block_out->i_pts;
-            if( p_sys->i_pts > M4A_PTS_START + INT64_C(500000) )
@@ -171 +167 @@
-
-            p_sys->i_bytes += p_block_out->i_buffer;
+
+            /* Correct timestamp */
+            p_block_out->i_pts += p_sys->i_time_offset;
+            p_block_out->i_dts += p_sys->i_time_offset;
+
+            /* */
+            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
+
-            es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
-

modules/demux/mpeg/mpga.c

@@ -304 +304 @@
-            block_t *p_next = p_block_out->p_next;
-
+            p_sys->i_pts = p_block_out->i_pts;
+
+            /* Correct timestamp */
+            p_block_out->i_pts += p_sys->i_time_offset;
+            p_block_out->i_dts += p_sys->i_time_offset;
+
-            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
-
-            p_block_out->p_next = NULL;
-            p_sys->i_pts = p_block_out->i_pts;
-            es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
-
@@ -394 +398 @@
-
-                /* Fix time_offset */
-
+
+
-            }
-            return i_ret;