[vlc-commits] TS demux: set PCR for all programs

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jul  8 18:33:12 2014 +0200| [8eb0b3d3b53c29b3495dcac275b5fe51f7633a6b] | committer: Rafaël Carré

TS demux: set PCR for all programs

Using the currently selected programs is wrong when we're using another
filter than --program.

Unconditionally use the PTS/DTS as PCR, which fixes automatically
lack of PCR.

Let's keep --no-ts-trust-pcr for when PCR is completely broken

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8eb0b3d3b53c29b3495dcac275b5fe51f7633a6b
---

 modules/demux/ts.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 49ab933..9c75a45 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -1732,9 +1732,8 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid, block_t *p_pes )
                          block_Duplicate( p_block ) );
         }
 
-        if (!p_sys->b_trust_pcr && pid->i_owner_number == p_sys->i_current_program) {
-            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts);
-        }
+        es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
+                pid->i_owner_number, p_block->i_pts);
 
         es_out_Send( p_demux->out, pid->es->id, p_block );
     }